From cd6006d2cdbb5c760b0bcc0edaf68d5f4a4c1e6d Mon Sep 17 00:00:00 2001 From: "nelsonb%netscape.com" Date: Thu, 15 Nov 2001 04:29:27 +0000 Subject: [PATCH] Now that the implementations of all the RNG_ functions have been moved from lib/util to lib/freebl, move the RNG header file there, too. Eliminate secrngt.h, which has been empty (except for the license boilerplate) for many releases. --- security/nss/lib/cryptohi/cryptohi.h | 3 +- security/nss/lib/freebl/manifest.mn | 1 + security/nss/lib/{util => freebl}/secrng.h | 2 +- security/nss/lib/util/manifest.mn | 2 - security/nss/lib/util/secrngt.h | 44 ---------------------- 5 files changed, 3 insertions(+), 49 deletions(-) rename security/nss/lib/{util => freebl}/secrng.h (97%) delete mode 100644 security/nss/lib/util/secrngt.h diff --git a/security/nss/lib/cryptohi/cryptohi.h b/security/nss/lib/cryptohi/cryptohi.h index dcb2b48c0fb0..91ab7344f2e0 100644 --- a/security/nss/lib/cryptohi/cryptohi.h +++ b/security/nss/lib/cryptohi/cryptohi.h @@ -32,7 +32,7 @@ * may use your version of this file under either the MPL or the * GPL. * - * $Id: cryptohi.h,v 1.3 2001/05/01 23:59:27 relyea%netscape.com Exp $ + * $Id: cryptohi.h,v 1.4 2001/11/15 04:29:19 nelsonb%netscape.com Exp $ */ #ifndef _CRYPTOHI_H_ @@ -41,7 +41,6 @@ #include "blapi.h" #include "seccomon.h" -#include "secrngt.h" #include "secoidt.h" #include "secdert.h" #include "cryptoht.h" diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn index aed21e113af3..0a102e6ed04d 100644 --- a/security/nss/lib/freebl/manifest.mn +++ b/security/nss/lib/freebl/manifest.mn @@ -53,6 +53,7 @@ REQUIRES = EXPORTS = \ blapi.h \ blapit.h \ + secrng.h \ $(NULL) PRIVATE_EXPORTS = \ diff --git a/security/nss/lib/util/secrng.h b/security/nss/lib/freebl/secrng.h similarity index 97% rename from security/nss/lib/util/secrng.h rename to security/nss/lib/freebl/secrng.h index 6222faf48ffc..93f217d2b5a4 100644 --- a/security/nss/lib/util/secrng.h +++ b/security/nss/lib/freebl/secrng.h @@ -37,7 +37,7 @@ * secrng.h - public data structures and prototypes for the secure random * number generator * - * $Id: secrng.h,v 1.2 2001/11/15 02:41:20 nelsonb%netscape.com Exp $ + * $Id: secrng.h,v 1.1 2001/11/15 04:29:23 nelsonb%netscape.com Exp $ */ /******************************************/ diff --git a/security/nss/lib/util/manifest.mn b/security/nss/lib/util/manifest.mn index d0a9c3755976..60ebb1fae54d 100644 --- a/security/nss/lib/util/manifest.mn +++ b/security/nss/lib/util/manifest.mn @@ -55,8 +55,6 @@ EXPORTS = \ secoid.h \ secoidt.h \ secport.h \ - secrng.h \ - secrngt.h \ secerr.h \ watcomfx.h \ $(NULL) diff --git a/security/nss/lib/util/secrngt.h b/security/nss/lib/util/secrngt.h deleted file mode 100644 index 7dc007973ce7..000000000000 --- a/security/nss/lib/util/secrngt.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifndef _SECRNGT_H_ -#define _SECRNGT_H_ -/* - * secrngt.h - public data structures for the secure random number generator - * - * $Id: secrngt.h,v 1.1 2000/03/31 19:41:32 relyea%netscape.com Exp $ - */ - -/* This file is really dead now. */ - -#endif /* _SECRNGT_H_ */