Bug 1480647 - Warn about deprecation of key.h and keyt.h. Include keyhi.h instead of key.h, and keythi.h instead of keyt.h. r=rrelyea
authorCosmin Truta <ctruta@magicleap.com>
Fri, 14 Sep 2018 12:33:57 +0200
changeset 14490 fe738aae0bcc2400fdc90d9847262a06cb5bfeb4
parent 14489 168510d45e3112cc7d9764799da5a72be130cc06
child 14491 2c85f81f9b5eda0fe8adc969ab0c2e90c33f7947
push id3190
push userkaie@kuix.de
push dateFri, 14 Sep 2018 10:34:04 +0000
reviewersrrelyea
bugs1480647
Bug 1480647 - Warn about deprecation of key.h and keyt.h. Include keyhi.h instead of key.h, and keythi.h instead of keyt.h. r=rrelyea
cmd/crmf-cgi/crmfcgi.c
cmd/crmftest/testcrmf.c
cmd/lib/secutil.h
cmd/tests/nonspr10.c
cmd/vfyserv/vfyserv.h
lib/certdb/cert.h
lib/certhigh/certreq.c
lib/certhigh/ocsp.h
lib/cryptohi/cryptohi.h
lib/cryptohi/key.h
lib/cryptohi/keyt.h
lib/jar/jarint.h
lib/nss/nssinit.c
lib/pk11wrap/pk11akey.c
lib/pk11wrap/pk11cert.c
lib/pk11wrap/pk11kea.c
lib/pk11wrap/pk11obj.c
lib/pk11wrap/pk11pbe.c
lib/pk11wrap/pk11pk12.c
lib/pk11wrap/pk11priv.h
lib/pk11wrap/pk11pub.h
lib/pk11wrap/secmodi.h
lib/pkcs12/p12.h
lib/pkcs12/p12t.h
lib/pkcs12/pkcs12t.h
lib/pkcs7/p7decode.c
lib/pkcs7/secmime.c
lib/pkcs7/secpkcs7.h
lib/smime/cms.h
lib/smime/cmsasn1.c
lib/smime/cmsdecode.c
lib/smime/cmsdigest.c
lib/smime/cmsencdata.c
lib/smime/cmsencode.c
lib/smime/cmsenvdata.c
lib/smime/cmspubkey.c
lib/smime/cmsrecinfo.c
lib/smime/cmsreclist.c
lib/smime/cmssiginfo.c
lib/smime/cmsutil.c
lib/smime/smimemessage.c
lib/smime/smimeutil.c
lib/ssl/authcert.c
lib/ssl/cmpcert.c
lib/ssl/ssl.h
--- a/cmd/crmf-cgi/crmfcgi.c
+++ b/cmd/crmf-cgi/crmfcgi.c
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "seccomon.h"
 #include "nss.h"
-#include "key.h"
+#include "keyhi.h"
 #include "cert.h"
 #include "pk11func.h"
 #include "secmod.h"
 #include "cmmf.h"
 #include "crmf.h"
 #include "base64.h"
 #include "secasn1.h"
 #include "cryptohi.h"
--- a/cmd/crmftest/testcrmf.c
+++ b/cmd/crmftest/testcrmf.c
@@ -61,17 +61,17 @@
 */
 
 #include <stdio.h>
 #include "nspr.h"
 #include "nss.h"
 #include "crmf.h"
 #include "secerr.h"
 #include "pk11func.h"
-#include "key.h"
+#include "keyhi.h"
 #include "cmmf.h"
 #include "plgetopt.h"
 #include "secutil.h"
 #include "pk11pqg.h"
 
 #if 0
 #include "pkcs11.h"
 #include "secmod.h"
--- a/cmd/lib/secutil.h
+++ b/cmd/lib/secutil.h
@@ -4,17 +4,17 @@
 #ifndef _SEC_UTIL_H_
 #define _SEC_UTIL_H_
 
 #include "seccomon.h"
 #include "secitem.h"
 #include "secport.h"
 #include "prerror.h"
 #include "base64.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secpkcs7.h"
 #include "secasn1.h"
 #include "secder.h"
 #include <stdio.h>
 
 #include "basicutil.h"
 #include "sslerr.h"
 #include "sslt.h"
--- a/cmd/tests/nonspr10.c
+++ b/cmd/tests/nonspr10.c
@@ -21,19 +21,17 @@
 #include "cmsreclist.h"
 #include "cmst.h"
 #include "crmf.h"
 #include "crmft.h"
 #include "cryptohi.h"
 #include "cryptoht.h"
 #include "ecl-exp.h"
 #include "hasht.h"
-#include "key.h"
 #include "keyhi.h"
-#include "keyt.h"
 #include "keythi.h"
 #include "nss.h"
 #include "nssb64.h"
 #include "nssb64t.h"
 #include "nssbase.h"
 #include "nssbaset.h"
 #include "nssckbi.h"
 #include "nssilckt.h"
--- a/cmd/vfyserv/vfyserv.h
+++ b/cmd/vfyserv/vfyserv.h
@@ -19,17 +19,17 @@
 /* NSS header files */
 
 #include "pk11func.h"
 #include "secitem.h"
 #include "ssl.h"
 #include "certt.h"
 #include "nss.h"
 #include "secder.h"
-#include "key.h"
+#include "keyhi.h"
 #include "sslproto.h"
 
 /* Custom header files */
 
 /*
 #include "sslerror.h"
 */
 
--- a/lib/certdb/cert.h
+++ b/lib/certdb/cert.h
@@ -13,17 +13,17 @@
 #include "plarena.h"
 #include "plhash.h"
 #include "prlong.h"
 #include "prlog.h"
 
 #include "seccomon.h"
 #include "secdert.h"
 #include "secoidt.h"
-#include "keyt.h"
+#include "keythi.h"
 #include "certt.h"
 
 SEC_BEGIN_PROTOS
 
 /****************************************************************************
  *
  * RFC1485 ascii to/from X.? RelativeDistinguishedName (aka CERTName)
  *
--- a/lib/certhigh/certreq.c
+++ b/lib/certhigh/certreq.c
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "cert.h"
 #include "certt.h"
 #include "secder.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secitem.h"
 #include "secasn1.h"
 #include "secerr.h"
 
 SEC_ASN1_MKSUB(SEC_AnyTemplate)
 
 const SEC_ASN1Template CERT_AttributeTemplate[] = {
     { SEC_ASN1_SEQUENCE,
--- a/lib/certhigh/ocsp.h
+++ b/lib/certhigh/ocsp.h
@@ -7,17 +7,17 @@
  */
 
 #ifndef _OCSP_H_
 #define _OCSP_H_
 
 #include "plarena.h"
 #include "seccomon.h"
 #include "secoidt.h"
-#include "keyt.h"
+#include "keythi.h"
 #include "certt.h"
 #include "ocspt.h"
 
 /************************************************************************/
 SEC_BEGIN_PROTOS
 
 /*
  * This function registers the HttpClient with whose functions the
--- a/lib/cryptohi/cryptohi.h
+++ b/lib/cryptohi/cryptohi.h
@@ -9,17 +9,17 @@
 #define _CRYPTOHI_H_
 
 #include "blapit.h"
 
 #include "seccomon.h"
 #include "secoidt.h"
 #include "secdert.h"
 #include "cryptoht.h"
-#include "keyt.h"
+#include "keythi.h"
 #include "certt.h"
 
 SEC_BEGIN_PROTOS
 
 /****************************************/
 /*
 ** DER encode/decode (EC)DSA signatures
 */
--- a/lib/cryptohi/key.h
+++ b/lib/cryptohi/key.h
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* This header is deprecated.  Please include keyhi.h instead. */
-
 #ifndef _KEY_H_
 #define _KEY_H_
 
+#if defined(_MSC_VER) || defined(__GNUC__) || defined(__clang__)
+#pragma message("key.h is deprecated. Please include keyhi.h instead.")
+#endif
+
 #include "keyhi.h"
 
 #endif /* _KEY_H_ */
--- a/lib/cryptohi/keyt.h
+++ b/lib/cryptohi/keyt.h
@@ -1,10 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef _KEYT_H_
 #define _KEYT_H_
 
+#if defined(_MSC_VER) || defined(__GNUC__) || defined(__clang__)
+#pragma message("keyt.h is deprecated. Please include keythi.h instead.")
+#endif
+
 #include "keythi.h"
 
 #endif /* _KEYT_H_ */
--- a/lib/jar/jarint.h
+++ b/lib/jar/jarint.h
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* JAR internal routines */
 
 #include "nspr.h"
-#include "key.h"
+#include "keyhi.h"
 #include "base64.h"
 
 extern CERTCertDBHandle *JAR_open_database(void);
 
 extern int JAR_close_database(CERTCertDBHandle *certdb);
 
 extern int jar_close_key_database(void *keydb);
 
--- a/lib/nss/nssinit.c
+++ b/lib/nss/nssinit.c
@@ -7,17 +7,17 @@
 
 #include <ctype.h>
 #include <string.h>
 #include "seccomon.h"
 #include "prinit.h"
 #include "prprf.h"
 #include "prmem.h"
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secmod.h"
 #include "secoid.h"
 #include "nss.h"
 #include "pk11func.h"
 #include "secerr.h"
 #include "nssbase.h"
 #include "nssutil.h"
 
--- a/lib/pk11wrap/pk11akey.c
+++ b/lib/pk11wrap/pk11akey.c
@@ -8,17 +8,17 @@
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pkcs11.h"
 #include "pkcs11t.h"
 #include "pk11func.h"
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "keyi.h"
 #include "secitem.h"
 #include "secasn1.h"
 #include "secoid.h"
 #include "secerr.h"
 #include "sechash.h"
 
 #include "secpkcs5.h"
--- a/lib/pk11wrap/pk11cert.c
+++ b/lib/pk11wrap/pk11cert.c
@@ -10,17 +10,17 @@
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pkcs11.h"
 #include "pk11func.h"
 #include "cert.h"
 #include "certi.h"
 #include "secitem.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secoid.h"
 #include "pkcs7t.h"
 #include "cmsreclist.h"
 
 #include "certdb.h"
 #include "secerr.h"
 #include "sslerr.h"
 
--- a/lib/pk11wrap/pk11kea.c
+++ b/lib/pk11wrap/pk11kea.c
@@ -9,17 +9,17 @@
 #include "seccomon.h"
 #include "secmod.h"
 #include "nssilock.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pkcs11.h"
 #include "pk11func.h"
 #include "secitem.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "sechash.h"
 #include "cert.h"
 #include "secerr.h"
 
 /*
  * find an RSA public key on a card
  */
--- a/lib/pk11wrap/pk11obj.c
+++ b/lib/pk11wrap/pk11obj.c
@@ -6,17 +6,17 @@
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pkcs11.h"
 #include "pkcs11t.h"
 #include "pk11func.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secitem.h"
 #include "secerr.h"
 #include "sslerr.h"
 
 #define PK11_SEARCH_CHUNKSIZE 10
 
 /*
  * Build a block big enough to hold the data
--- a/lib/pk11wrap/pk11pbe.c
+++ b/lib/pk11wrap/pk11pbe.c
@@ -18,17 +18,17 @@
 #include "secmod.h"
 #include "pk11func.h"
 #include "secpkcs5.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pkcs11.h"
 #include "pk11func.h"
 #include "secitem.h"
-#include "key.h"
+#include "keyhi.h"
 
 typedef struct SEC_PKCS5PBEParameterStr SEC_PKCS5PBEParameter;
 struct SEC_PKCS5PBEParameterStr {
     PLArenaPool *poolp;
     SECItem salt;              /* octet string */
     SECItem iteration;         /* integer */
     SECItem keyLength;         /* PKCS5v2 only */
     SECAlgorithmID *pPrfAlgId; /* PKCS5v2 only */
--- a/lib/pk11wrap/pk11pk12.c
+++ b/lib/pk11wrap/pk11pk12.c
@@ -9,17 +9,17 @@
  */
 
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
 #include "pkcs11.h"
 #include "pk11func.h"
 #include "secitem.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secoid.h"
 #include "secasn1.h"
 #include "secerr.h"
 #include "prerror.h"
 
 /* These data structures should move to a common .h file shared between the
  * wrappers and the pkcs 12 code. */
 
--- a/lib/pk11wrap/pk11priv.h
+++ b/lib/pk11wrap/pk11priv.h
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef _PK11PRIV_H_
 #define _PK11PRIV_H_
 #include "plarena.h"
 #include "seccomon.h"
 #include "secoidt.h"
 #include "secdert.h"
-#include "keyt.h"
+#include "keythi.h"
 #include "certt.h"
 #include "pkcs11t.h"
 #include "secmodt.h"
 #include "seccomon.h"
 #include "pkcs7t.h"
 #include "cmsreclist.h"
 #include "pkcs11uri.h"
 
--- a/lib/pk11wrap/pk11pub.h
+++ b/lib/pk11wrap/pk11pub.h
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef _PK11PUB_H_
 #define _PK11PUB_H_
 #include "plarena.h"
 #include "seccomon.h"
 #include "secoidt.h"
 #include "secdert.h"
-#include "keyt.h"
+#include "keythi.h"
 #include "certt.h"
 #include "pkcs11t.h"
 #include "secmodt.h"
 #include "seccomon.h"
 #include "pkcs7t.h"
 #include "cmsreclist.h"
 
 /*
--- a/lib/pk11wrap/secmodi.h
+++ b/lib/pk11wrap/secmodi.h
@@ -8,17 +8,17 @@
 #ifndef _SECMODI_H_
 #define _SECMODI_H_ 1
 #include "pkcs11.h"
 #include "nssilock.h"
 #include "secoidt.h"
 #include "secdert.h"
 #include "certt.h"
 #include "secmodt.h"
-#include "keyt.h"
+#include "keythi.h"
 
 SEC_BEGIN_PROTOS
 
 /* proto-types */
 extern SECStatus SECMOD_DeletePermDB(SECMODModule *module);
 extern SECStatus SECMOD_AddPermDB(SECMODModule *module);
 extern SECStatus SECMOD_Shutdown(void);
 void nss_DumpModuleLog(void);
--- a/lib/pkcs12/p12.h
+++ b/lib/pkcs12/p12.h
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef _P12_H_
 #define _P12_H_
 
 #include "secoid.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secpkcs7.h"
 #include "p12t.h"
 
 typedef int(PR_CALLBACK *PKCS12OpenFunction)(void *arg);
 typedef int(PR_CALLBACK *PKCS12ReadFunction)(void *arg,
                                              unsigned char *buffer,
                                              unsigned int *lenRead,
                                              unsigned int maxLen);
--- a/lib/pkcs12/p12t.h
+++ b/lib/pkcs12/p12t.h
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef _P12T_H_
 #define _P12T_H_
 
 #include "secoid.h"
-#include "key.h"
+#include "keythi.h"
 #include "pkcs11.h"
 #include "secpkcs7.h"
 #include "secdig.h" /* for SGNDigestInfo */
 #include "pkcs12t.h"
 
 #define SEC_PKCS12_VERSION 3
 
 /* structure declarations */
--- a/lib/pkcs12/pkcs12t.h
+++ b/lib/pkcs12/pkcs12t.h
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef _PKCS12T_H_
 #define _PKCS12T_H_
 
 #include "seccomon.h"
 #include "secoid.h"
 #include "cert.h"
-#include "key.h"
+#include "keythi.h"
 #include "plarena.h"
 #include "secpkcs7.h"
 #include "secdig.h" /* for SGNDigestInfo */
 
 typedef enum {
     SECPKCS12TargetTokenNoCAs,           /* CA get loaded intothe fixed token,
                                           * User certs go to target token */
     SECPKCS12TargetTokenIntermediateCAs, /* User certs and intermediates go to
--- a/lib/pkcs7/p7decode.c
+++ b/lib/pkcs7/p7decode.c
@@ -11,17 +11,17 @@
 #include "cert.h"
 /* XXX do not want to have to include */
 #include "certdb.h" /* certdb.h -- the trust stuff needed by */
                     /* the add certificate code needs to get */
                     /* rewritten/abstracted and then this */
                     /* include should be removed! */
 /*#include "cdbhdl.h" */
 #include "cryptohi.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
 #include "sechash.h" /* for HASH_GetHashObject() */
 #include "secder.h"
--- a/lib/pkcs7/secmime.c
+++ b/lib/pkcs7/secmime.c
@@ -9,17 +9,17 @@
 
 #include "secmime.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "ciferfam.h" /* for CIPHER_FAMILY symbols */
 #include "secasn1.h"
 #include "secitem.h"
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secerr.h"
 
 typedef struct smime_cipher_map_struct {
     unsigned long cipher;
     SECOidTag algtag;
     SECItem *parms;
 } smime_cipher_map;
 
--- a/lib/pkcs7/secpkcs7.h
+++ b/lib/pkcs7/secpkcs7.h
@@ -8,17 +8,17 @@
 
 #ifndef _SECPKCS7_H_
 #define _SECPKCS7_H_
 
 #include "seccomon.h"
 
 #include "secoidt.h"
 #include "certt.h"
-#include "keyt.h"
+#include "keythi.h"
 #include "hasht.h"
 #include "pkcs7t.h"
 
 extern const SEC_ASN1Template sec_PKCS7ContentInfoTemplate[];
 
 /************************************************************************/
 SEC_BEGIN_PROTOS
 
--- a/lib/smime/cms.h
+++ b/lib/smime/cms.h
@@ -8,17 +8,17 @@
 
 #ifndef _CMS_H_
 #define _CMS_H_
 
 #include "seccomon.h"
 
 #include "secoidt.h"
 #include "certt.h"
-#include "keyt.h"
+#include "keythi.h"
 #include "hasht.h"
 #include "cmst.h"
 
 /************************************************************************/
 SEC_BEGIN_PROTOS
 
 /************************************************************************
  * cmsdecode.c - CMS decoding
--- a/lib/smime/cmsasn1.c
+++ b/lib/smime/cmsasn1.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS ASN.1 templates
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "prtime.h"
 #include "secerr.h"
 
 extern const SEC_ASN1Template nss_cms_set_of_attribute_template[];
 
--- a/lib/smime/cmsdecode.c
+++ b/lib/smime/cmsdecode.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS decoding.
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "prtime.h"
 #include "secerr.h"
 
 struct NSSCMSDecoderContextStr {
     SEC_ASN1DecoderContext *dcx;      /* ASN.1 decoder context */
--- a/lib/smime/cmsdigest.c
+++ b/lib/smime/cmsdigest.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS digesting.
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
 
 /*  #define CMS_FIND_LEAK_MULTIPLE 1 */
 #ifdef CMS_FIND_LEAK_MULTIPLE
--- a/lib/smime/cmsencdata.c
+++ b/lib/smime/cmsencdata.c
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * CMS encryptedData methods.
  */
 
 #include "cmslocal.h"
 
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
 #include "secpkcs5.h"
 
--- a/lib/smime/cmsencode.c
+++ b/lib/smime/cmsencode.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS encoding.
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secoid.h"
 #include "secitem.h"
 #include "pk11func.h"
 #include "secerr.h"
 
 struct nss_cms_encoder_output {
     NSSCMSContentCallback outputfn;
--- a/lib/smime/cmsenvdata.c
+++ b/lib/smime/cmsenvdata.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS envelopedData methods.
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "secerr.h"
 #include "secpkcs5.h"
 
 /*
--- a/lib/smime/cmspubkey.c
+++ b/lib/smime/cmspubkey.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS public key crypto
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "secerr.h"
 
 /* ====== RSA ======================================================================= */
 
--- a/lib/smime/cmsrecinfo.c
+++ b/lib/smime/cmsrecinfo.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS recipientInfo methods.
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "secerr.h"
 
 PRBool
 nss_cmsrecipientinfo_usessubjectkeyid(NSSCMSRecipientInfo *ri)
--- a/lib/smime/cmsreclist.c
+++ b/lib/smime/cmsreclist.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS recipient list functions
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
 
 static int
--- a/lib/smime/cmssiginfo.c
+++ b/lib/smime/cmssiginfo.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS signerInfo methods.
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
 #include "secder.h"
 #include "cryptohi.h"
--- a/lib/smime/cmsutil.c
+++ b/lib/smime/cmsutil.c
@@ -4,17 +4,17 @@
 
 /*
  * CMS miscellaneous utility functions.
  */
 
 #include "cmslocal.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "secerr.h"
 #include "sechash.h"
 
 /*
--- a/lib/smime/smimemessage.c
+++ b/lib/smime/smimemessage.c
@@ -5,17 +5,17 @@
 /*
  * SMIME message methods
  */
 
 #include "cmslocal.h"
 #include "smime.h"
 
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
 
 #if 0
--- a/lib/smime/smimeutil.c
+++ b/lib/smime/smimeutil.c
@@ -8,17 +8,17 @@
 
 #include "secmime.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "ciferfam.h" /* for CIPHER_FAMILY symbols */
 #include "secasn1.h"
 #include "secitem.h"
 #include "cert.h"
-#include "key.h"
+#include "keyhi.h"
 #include "secerr.h"
 #include "cms.h"
 #include "nss.h"
 
 SEC_ASN1_MKSUB(CERT_IssuerAndSNTemplate)
 SEC_ASN1_MKSUB(SEC_OctetStringTemplate)
 SEC_ASN1_CHOOSER_DECLARE(CERT_IssuerAndSNTemplate)
 
--- a/lib/ssl/authcert.c
+++ b/lib/ssl/authcert.c
@@ -8,17 +8,17 @@
 #include <stdio.h>
 #include <string.h>
 #include "prerror.h"
 #include "secitem.h"
 #include "prnetdb.h"
 #include "cert.h"
 #include "nspr.h"
 #include "secder.h"
-#include "key.h"
+#include "keyhi.h"
 #include "nss.h"
 #include "ssl.h"
 #include "pk11func.h" /* for PK11_ function calls */
 #include "sslimpl.h"
 
 /*
  * This callback used by SSL to pull client sertificate upon
  * server request
--- a/lib/ssl/cmpcert.c
+++ b/lib/ssl/cmpcert.c
@@ -8,17 +8,17 @@
 #include <stdio.h>
 #include <string.h>
 #include "prerror.h"
 #include "secitem.h"
 #include "prnetdb.h"
 #include "cert.h"
 #include "nspr.h"
 #include "secder.h"
-#include "key.h"
+#include "keyhi.h"
 #include "nss.h"
 
 /*
  * Look to see if any of the signers in the cert chain for "cert" are found
  * in the list of caNames.
  * Returns SECSuccess if so, SECFailure if not.
  */
 SECStatus
--- a/lib/ssl/ssl.h
+++ b/lib/ssl/ssl.h
@@ -8,17 +8,17 @@
 #ifndef __ssl_h_
 #define __ssl_h_
 
 #include "prtypes.h"
 #include "prerror.h"
 #include "prio.h"
 #include "seccomon.h"
 #include "cert.h"
-#include "keyt.h"
+#include "keythi.h"
 
 #include "sslt.h" /* public ssl data types */
 
 #if defined(_WIN32) && !defined(IN_LIBSSL) && !defined(NSS_USE_STATIC_LIBS)
 #define SSL_IMPORT extern __declspec(dllimport)
 #else
 #define SSL_IMPORT extern
 #endif