From a456c6d9a9b9a86fa28c4a7a1a3a5f428d6ffc83 Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Wed, 19 Sep 2018 09:43:03 -0700 Subject: [PATCH] Bug 1488622 - land NSS fe738aae0bcc UPGRADE_NSS_RELEASE, r=me --HG-- extra : rebase_source : c5e74447ceed1014ab1a3bb6abbdc28ac12fa11a --- security/nss/TAG-INFO | 2 +- .../nss/automation/taskcluster/graph/src/extend.js | 12 ++++++------ security/nss/cmd/crmf-cgi/crmfcgi.c | 2 +- security/nss/cmd/crmftest/testcrmf.c | 2 +- security/nss/cmd/lib/secutil.h | 2 +- security/nss/cmd/tests/nonspr10.c | 2 -- security/nss/cmd/vfyserv/vfyserv.h | 2 +- security/nss/coreconf/coreconf.dep | 1 - security/nss/lib/certdb/cert.h | 2 +- security/nss/lib/certhigh/certreq.c | 2 +- security/nss/lib/certhigh/ocsp.h | 2 +- security/nss/lib/cryptohi/cryptohi.h | 2 +- security/nss/lib/cryptohi/key.h | 6 ++++-- security/nss/lib/cryptohi/keyt.h | 4 ++++ security/nss/lib/jar/jarint.h | 2 +- security/nss/lib/nss/nssinit.c | 2 +- security/nss/lib/pk11wrap/pk11akey.c | 2 +- security/nss/lib/pk11wrap/pk11cert.c | 2 +- security/nss/lib/pk11wrap/pk11kea.c | 2 +- security/nss/lib/pk11wrap/pk11obj.c | 2 +- security/nss/lib/pk11wrap/pk11pbe.c | 2 +- security/nss/lib/pk11wrap/pk11pk12.c | 2 +- security/nss/lib/pk11wrap/pk11priv.h | 2 +- security/nss/lib/pk11wrap/pk11pub.h | 2 +- security/nss/lib/pk11wrap/secmodi.h | 2 +- security/nss/lib/pkcs12/p12.h | 2 +- security/nss/lib/pkcs12/p12t.h | 2 +- security/nss/lib/pkcs12/pkcs12t.h | 2 +- security/nss/lib/pkcs7/p7decode.c | 2 +- security/nss/lib/pkcs7/secmime.c | 2 +- security/nss/lib/pkcs7/secpkcs7.h | 2 +- security/nss/lib/smime/cms.h | 2 +- security/nss/lib/smime/cmsasn1.c | 2 +- security/nss/lib/smime/cmsdecode.c | 2 +- security/nss/lib/smime/cmsdigest.c | 2 +- security/nss/lib/smime/cmsencdata.c | 2 +- security/nss/lib/smime/cmsencode.c | 2 +- security/nss/lib/smime/cmsenvdata.c | 2 +- security/nss/lib/smime/cmspubkey.c | 2 +- security/nss/lib/smime/cmsrecinfo.c | 2 +- security/nss/lib/smime/cmsreclist.c | 2 +- security/nss/lib/smime/cmssiginfo.c | 2 +- security/nss/lib/smime/cmsutil.c | 2 +- security/nss/lib/smime/smimemessage.c | 2 +- security/nss/lib/smime/smimeutil.c | 2 +- security/nss/lib/ssl/authcert.c | 2 +- security/nss/lib/ssl/cmpcert.c | 2 +- security/nss/lib/ssl/ssl.h | 2 +- 48 files changed, 57 insertions(+), 54 deletions(-) diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO index 96c4d994db0e..21b24b1106cd 100644 --- a/security/nss/TAG-INFO +++ b/security/nss/TAG-INFO @@ -1 +1 @@ -8f6014565b91 +fe738aae0bcc diff --git a/security/nss/automation/taskcluster/graph/src/extend.js b/security/nss/automation/taskcluster/graph/src/extend.js index 37e716d9b381..1001d2455c6e 100644 --- a/security/nss/automation/taskcluster/graph/src/extend.js +++ b/security/nss/automation/taskcluster/graph/src/extend.js @@ -790,12 +790,12 @@ async function scheduleWindows(name, base, build_script) { base = merge(base, { workerType: "nss-win2012r2", env: { - PATH: "c:\\mozilla-build\\python;c:\\mozilla-build\\msys\\local\\bin;" + - "c:\\mozilla-build\\7zip;c:\\mozilla-build\\info-zip;" + - "c:\\mozilla-build\\python\\Scripts;c:\\mozilla-build\\yasm;" + - "c:\\mozilla-build\\msys\\bin;c:\\Windows\\system32;" + - "c:\\mozilla-build\\upx391w;c:\\mozilla-build\\moztools-x64\\bin;" + - "c:\\mozilla-build\\wget", + PATH: "c:\\mozilla-build\\bin;c:\\mozilla-build\\python;" + + "c:\\mozilla-build\\msys\\local\\bin;c:\\mozilla-build\\7zip;" + + "c:\\mozilla-build\\info-zip;c:\\mozilla-build\\python\\Scripts;" + + "c:\\mozilla-build\\yasm;c:\\mozilla-build\\msys\\bin;" + + "c:\\Windows\\system32;c:\\mozilla-build\\upx391w;" + + "c:\\mozilla-build\\moztools-x64\\bin;c:\\mozilla-build\\wget", DOMSUF: "localdomain", HOST: "localhost", } diff --git a/security/nss/cmd/crmf-cgi/crmfcgi.c b/security/nss/cmd/crmf-cgi/crmfcgi.c index 07b81f233a0f..9f6174383c79 100644 --- a/security/nss/cmd/crmf-cgi/crmfcgi.c +++ b/security/nss/cmd/crmf-cgi/crmfcgi.c @@ -4,7 +4,7 @@ #include "seccomon.h" #include "nss.h" -#include "key.h" +#include "keyhi.h" #include "cert.h" #include "pk11func.h" #include "secmod.h" diff --git a/security/nss/cmd/crmftest/testcrmf.c b/security/nss/cmd/crmftest/testcrmf.c index 1c1359b1bc62..3fe5725bfe99 100644 --- a/security/nss/cmd/crmftest/testcrmf.c +++ b/security/nss/cmd/crmftest/testcrmf.c @@ -66,7 +66,7 @@ #include "crmf.h" #include "secerr.h" #include "pk11func.h" -#include "key.h" +#include "keyhi.h" #include "cmmf.h" #include "plgetopt.h" #include "secutil.h" diff --git a/security/nss/cmd/lib/secutil.h b/security/nss/cmd/lib/secutil.h index ed3372c14fa0..90d7639097c9 100644 --- a/security/nss/cmd/lib/secutil.h +++ b/security/nss/cmd/lib/secutil.h @@ -9,7 +9,7 @@ #include "secport.h" #include "prerror.h" #include "base64.h" -#include "key.h" +#include "keyhi.h" #include "secpkcs7.h" #include "secasn1.h" #include "secder.h" diff --git a/security/nss/cmd/tests/nonspr10.c b/security/nss/cmd/tests/nonspr10.c index 295484a1caf5..fc700407a794 100644 --- a/security/nss/cmd/tests/nonspr10.c +++ b/security/nss/cmd/tests/nonspr10.c @@ -26,9 +26,7 @@ #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" diff --git a/security/nss/cmd/vfyserv/vfyserv.h b/security/nss/cmd/vfyserv/vfyserv.h index 00afc8049442..5bcc51a50de0 100644 --- a/security/nss/cmd/vfyserv/vfyserv.h +++ b/security/nss/cmd/vfyserv/vfyserv.h @@ -24,7 +24,7 @@ #include "certt.h" #include "nss.h" #include "secder.h" -#include "key.h" +#include "keyhi.h" #include "sslproto.h" /* Custom header files */ diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep index 590d1bfaeee3..5182f75552c8 100644 --- a/security/nss/coreconf/coreconf.dep +++ b/security/nss/coreconf/coreconf.dep @@ -10,4 +10,3 @@ */ #error "Do not include this header file." - diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h index c76a5a9b0336..333ba4c9dd42 100644 --- a/security/nss/lib/certdb/cert.h +++ b/security/nss/lib/certdb/cert.h @@ -18,7 +18,7 @@ #include "seccomon.h" #include "secdert.h" #include "secoidt.h" -#include "keyt.h" +#include "keythi.h" #include "certt.h" SEC_BEGIN_PROTOS diff --git a/security/nss/lib/certhigh/certreq.c b/security/nss/lib/certhigh/certreq.c index 4087bc978e26..2ab4f1ab7b6b 100644 --- a/security/nss/lib/certhigh/certreq.c +++ b/security/nss/lib/certhigh/certreq.c @@ -5,7 +5,7 @@ #include "cert.h" #include "certt.h" #include "secder.h" -#include "key.h" +#include "keyhi.h" #include "secitem.h" #include "secasn1.h" #include "secerr.h" diff --git a/security/nss/lib/certhigh/ocsp.h b/security/nss/lib/certhigh/ocsp.h index ac9dd6465675..1b94aec2e343 100644 --- a/security/nss/lib/certhigh/ocsp.h +++ b/security/nss/lib/certhigh/ocsp.h @@ -12,7 +12,7 @@ #include "plarena.h" #include "seccomon.h" #include "secoidt.h" -#include "keyt.h" +#include "keythi.h" #include "certt.h" #include "ocspt.h" diff --git a/security/nss/lib/cryptohi/cryptohi.h b/security/nss/lib/cryptohi/cryptohi.h index e529fa34f5c8..7b66f0b0b98c 100644 --- a/security/nss/lib/cryptohi/cryptohi.h +++ b/security/nss/lib/cryptohi/cryptohi.h @@ -14,7 +14,7 @@ #include "secoidt.h" #include "secdert.h" #include "cryptoht.h" -#include "keyt.h" +#include "keythi.h" #include "certt.h" SEC_BEGIN_PROTOS diff --git a/security/nss/lib/cryptohi/key.h b/security/nss/lib/cryptohi/key.h index 3e89b74cb6a1..8392031c5a7a 100644 --- a/security/nss/lib/cryptohi/key.h +++ b/security/nss/lib/cryptohi/key.h @@ -2,11 +2,13 @@ * 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_ */ diff --git a/security/nss/lib/cryptohi/keyt.h b/security/nss/lib/cryptohi/keyt.h index 99da312f6dc7..5a0d2c2e7c50 100644 --- a/security/nss/lib/cryptohi/keyt.h +++ b/security/nss/lib/cryptohi/keyt.h @@ -5,6 +5,10 @@ #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_ */ diff --git a/security/nss/lib/jar/jarint.h b/security/nss/lib/jar/jarint.h index 21aecef89a22..0f40f931f60e 100644 --- a/security/nss/lib/jar/jarint.h +++ b/security/nss/lib/jar/jarint.h @@ -5,7 +5,7 @@ /* JAR internal routines */ #include "nspr.h" -#include "key.h" +#include "keyhi.h" #include "base64.h" extern CERTCertDBHandle *JAR_open_database(void); diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c index 989572948c91..9b601277153f 100644 --- a/security/nss/lib/nss/nssinit.c +++ b/security/nss/lib/nss/nssinit.c @@ -12,7 +12,7 @@ #include "prprf.h" #include "prmem.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secmod.h" #include "secoid.h" #include "nss.h" diff --git a/security/nss/lib/pk11wrap/pk11akey.c b/security/nss/lib/pk11wrap/pk11akey.c index c45901ec3961..c6070e264db0 100644 --- a/security/nss/lib/pk11wrap/pk11akey.c +++ b/security/nss/lib/pk11wrap/pk11akey.c @@ -13,7 +13,7 @@ #include "pkcs11t.h" #include "pk11func.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "keyi.h" #include "secitem.h" #include "secasn1.h" diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c index 66d6c40df693..81976964312b 100644 --- a/security/nss/lib/pk11wrap/pk11cert.c +++ b/security/nss/lib/pk11wrap/pk11cert.c @@ -15,7 +15,7 @@ #include "cert.h" #include "certi.h" #include "secitem.h" -#include "key.h" +#include "keyhi.h" #include "secoid.h" #include "pkcs7t.h" #include "cmsreclist.h" diff --git a/security/nss/lib/pk11wrap/pk11kea.c b/security/nss/lib/pk11wrap/pk11kea.c index 331a19c1689e..1f228cfaf7eb 100644 --- a/security/nss/lib/pk11wrap/pk11kea.c +++ b/security/nss/lib/pk11wrap/pk11kea.c @@ -14,7 +14,7 @@ #include "pkcs11.h" #include "pk11func.h" #include "secitem.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "sechash.h" #include "cert.h" diff --git a/security/nss/lib/pk11wrap/pk11obj.c b/security/nss/lib/pk11wrap/pk11obj.c index b97caddd44e8..937ac654a58e 100644 --- a/security/nss/lib/pk11wrap/pk11obj.c +++ b/security/nss/lib/pk11wrap/pk11obj.c @@ -11,7 +11,7 @@ #include "pkcs11.h" #include "pkcs11t.h" #include "pk11func.h" -#include "key.h" +#include "keyhi.h" #include "secitem.h" #include "secerr.h" #include "sslerr.h" diff --git a/security/nss/lib/pk11wrap/pk11pbe.c b/security/nss/lib/pk11wrap/pk11pbe.c index 5f68f399e599..4b6645578d4e 100644 --- a/security/nss/lib/pk11wrap/pk11pbe.c +++ b/security/nss/lib/pk11wrap/pk11pbe.c @@ -23,7 +23,7 @@ #include "pkcs11.h" #include "pk11func.h" #include "secitem.h" -#include "key.h" +#include "keyhi.h" typedef struct SEC_PKCS5PBEParameterStr SEC_PKCS5PBEParameter; struct SEC_PKCS5PBEParameterStr { diff --git a/security/nss/lib/pk11wrap/pk11pk12.c b/security/nss/lib/pk11wrap/pk11pk12.c index 035143af8091..47b6702c6db5 100644 --- a/security/nss/lib/pk11wrap/pk11pk12.c +++ b/security/nss/lib/pk11wrap/pk11pk12.c @@ -14,7 +14,7 @@ #include "pkcs11.h" #include "pk11func.h" #include "secitem.h" -#include "key.h" +#include "keyhi.h" #include "secoid.h" #include "secasn1.h" #include "secerr.h" diff --git a/security/nss/lib/pk11wrap/pk11priv.h b/security/nss/lib/pk11wrap/pk11priv.h index 9281923fac82..8848c81eca2c 100644 --- a/security/nss/lib/pk11wrap/pk11priv.h +++ b/security/nss/lib/pk11wrap/pk11priv.h @@ -7,7 +7,7 @@ #include "seccomon.h" #include "secoidt.h" #include "secdert.h" -#include "keyt.h" +#include "keythi.h" #include "certt.h" #include "pkcs11t.h" #include "secmodt.h" diff --git a/security/nss/lib/pk11wrap/pk11pub.h b/security/nss/lib/pk11wrap/pk11pub.h index dbd8da092394..8db969e4cfde 100644 --- a/security/nss/lib/pk11wrap/pk11pub.h +++ b/security/nss/lib/pk11wrap/pk11pub.h @@ -7,7 +7,7 @@ #include "seccomon.h" #include "secoidt.h" #include "secdert.h" -#include "keyt.h" +#include "keythi.h" #include "certt.h" #include "pkcs11t.h" #include "secmodt.h" diff --git a/security/nss/lib/pk11wrap/secmodi.h b/security/nss/lib/pk11wrap/secmodi.h index 84f5f2a306b3..7ec77ced6092 100644 --- a/security/nss/lib/pk11wrap/secmodi.h +++ b/security/nss/lib/pk11wrap/secmodi.h @@ -13,7 +13,7 @@ #include "secdert.h" #include "certt.h" #include "secmodt.h" -#include "keyt.h" +#include "keythi.h" SEC_BEGIN_PROTOS diff --git a/security/nss/lib/pkcs12/p12.h b/security/nss/lib/pkcs12/p12.h index 118db6efafce..495bbf6c49d6 100644 --- a/security/nss/lib/pkcs12/p12.h +++ b/security/nss/lib/pkcs12/p12.h @@ -6,7 +6,7 @@ #define _P12_H_ #include "secoid.h" -#include "key.h" +#include "keyhi.h" #include "secpkcs7.h" #include "p12t.h" diff --git a/security/nss/lib/pkcs12/p12t.h b/security/nss/lib/pkcs12/p12t.h index 62c2b502e23a..b22f0dd8232b 100644 --- a/security/nss/lib/pkcs12/p12t.h +++ b/security/nss/lib/pkcs12/p12t.h @@ -6,7 +6,7 @@ #define _P12T_H_ #include "secoid.h" -#include "key.h" +#include "keythi.h" #include "pkcs11.h" #include "secpkcs7.h" #include "secdig.h" /* for SGNDigestInfo */ diff --git a/security/nss/lib/pkcs12/pkcs12t.h b/security/nss/lib/pkcs12/pkcs12t.h index ad00d7b5b550..db10d28af725 100644 --- a/security/nss/lib/pkcs12/pkcs12t.h +++ b/security/nss/lib/pkcs12/pkcs12t.h @@ -8,7 +8,7 @@ #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 */ diff --git a/security/nss/lib/pkcs7/p7decode.c b/security/nss/lib/pkcs7/p7decode.c index ba51955abf74..641d201e5ad0 100644 --- a/security/nss/lib/pkcs7/p7decode.c +++ b/security/nss/lib/pkcs7/p7decode.c @@ -16,7 +16,7 @@ /* 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" diff --git a/security/nss/lib/pkcs7/secmime.c b/security/nss/lib/pkcs7/secmime.c index ca1046aa510b..8a4afe45b7f4 100644 --- a/security/nss/lib/pkcs7/secmime.c +++ b/security/nss/lib/pkcs7/secmime.c @@ -14,7 +14,7 @@ #include "secasn1.h" #include "secitem.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secerr.h" typedef struct smime_cipher_map_struct { diff --git a/security/nss/lib/pkcs7/secpkcs7.h b/security/nss/lib/pkcs7/secpkcs7.h index 78270bd150d7..4a88df1dfb53 100644 --- a/security/nss/lib/pkcs7/secpkcs7.h +++ b/security/nss/lib/pkcs7/secpkcs7.h @@ -13,7 +13,7 @@ #include "secoidt.h" #include "certt.h" -#include "keyt.h" +#include "keythi.h" #include "hasht.h" #include "pkcs7t.h" diff --git a/security/nss/lib/smime/cms.h b/security/nss/lib/smime/cms.h index 244df4879d25..f4a8a39e9ec0 100644 --- a/security/nss/lib/smime/cms.h +++ b/security/nss/lib/smime/cms.h @@ -13,7 +13,7 @@ #include "secoidt.h" #include "certt.h" -#include "keyt.h" +#include "keythi.h" #include "hasht.h" #include "cmst.h" diff --git a/security/nss/lib/smime/cmsasn1.c b/security/nss/lib/smime/cmsasn1.c index 15cf08fcc9ad..8ba95d044e69 100644 --- a/security/nss/lib/smime/cmsasn1.c +++ b/security/nss/lib/smime/cmsasn1.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmsdecode.c b/security/nss/lib/smime/cmsdecode.c index 62b4ebfe54bb..69965bdd7dcf 100644 --- a/security/nss/lib/smime/cmsdecode.c +++ b/security/nss/lib/smime/cmsdecode.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmsdigest.c b/security/nss/lib/smime/cmsdigest.c index 64b64a0f8e0c..bd14740682e4 100644 --- a/security/nss/lib/smime/cmsdigest.c +++ b/security/nss/lib/smime/cmsdigest.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secitem.h" #include "secoid.h" #include "pk11func.h" diff --git a/security/nss/lib/smime/cmsencdata.c b/security/nss/lib/smime/cmsencdata.c index c3a4549adbae..d2fc3358b94b 100644 --- a/security/nss/lib/smime/cmsencdata.c +++ b/security/nss/lib/smime/cmsencdata.c @@ -8,7 +8,7 @@ #include "cmslocal.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmsencode.c b/security/nss/lib/smime/cmsencode.c index 0d723e865f2c..703492b5e383 100644 --- a/security/nss/lib/smime/cmsencode.c +++ b/security/nss/lib/smime/cmsencode.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secoid.h" #include "secitem.h" diff --git a/security/nss/lib/smime/cmsenvdata.c b/security/nss/lib/smime/cmsenvdata.c index f2c8e171dc86..d5d5c4123953 100644 --- a/security/nss/lib/smime/cmsenvdata.c +++ b/security/nss/lib/smime/cmsenvdata.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmspubkey.c b/security/nss/lib/smime/cmspubkey.c index bc3cd993e736..8f18f60de1c7 100644 --- a/security/nss/lib/smime/cmspubkey.c +++ b/security/nss/lib/smime/cmspubkey.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmsrecinfo.c b/security/nss/lib/smime/cmsrecinfo.c index 8cab288d2e30..20dd698e8fd7 100644 --- a/security/nss/lib/smime/cmsrecinfo.c +++ b/security/nss/lib/smime/cmsrecinfo.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmsreclist.c b/security/nss/lib/smime/cmsreclist.c index 99d7e908759b..f753474073d0 100644 --- a/security/nss/lib/smime/cmsreclist.c +++ b/security/nss/lib/smime/cmsreclist.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmssiginfo.c b/security/nss/lib/smime/cmssiginfo.c index ce4f87c0ae66..79aaf8f0aae9 100644 --- a/security/nss/lib/smime/cmssiginfo.c +++ b/security/nss/lib/smime/cmssiginfo.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/cmsutil.c b/security/nss/lib/smime/cmsutil.c index cd12603fa3ee..713b94aacbb6 100644 --- a/security/nss/lib/smime/cmsutil.c +++ b/security/nss/lib/smime/cmsutil.c @@ -9,7 +9,7 @@ #include "cmslocal.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/smimemessage.c b/security/nss/lib/smime/smimemessage.c index 774b9f3fd45f..3073ab24572a 100644 --- a/security/nss/lib/smime/smimemessage.c +++ b/security/nss/lib/smime/smimemessage.c @@ -10,7 +10,7 @@ #include "smime.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secasn1.h" #include "secitem.h" #include "secoid.h" diff --git a/security/nss/lib/smime/smimeutil.c b/security/nss/lib/smime/smimeutil.c index 7674a65fdb88..0e6bd32fdc7e 100644 --- a/security/nss/lib/smime/smimeutil.c +++ b/security/nss/lib/smime/smimeutil.c @@ -13,7 +13,7 @@ #include "secasn1.h" #include "secitem.h" #include "cert.h" -#include "key.h" +#include "keyhi.h" #include "secerr.h" #include "cms.h" #include "nss.h" diff --git a/security/nss/lib/ssl/authcert.c b/security/nss/lib/ssl/authcert.c index 2765c83420e5..d05b30a72ce3 100644 --- a/security/nss/lib/ssl/authcert.c +++ b/security/nss/lib/ssl/authcert.c @@ -13,7 +13,7 @@ #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 */ diff --git a/security/nss/lib/ssl/cmpcert.c b/security/nss/lib/ssl/cmpcert.c index 07efeeea4e0d..8ab4a7f8d98e 100644 --- a/security/nss/lib/ssl/cmpcert.c +++ b/security/nss/lib/ssl/cmpcert.c @@ -13,7 +13,7 @@ #include "cert.h" #include "nspr.h" #include "secder.h" -#include "key.h" +#include "keyhi.h" #include "nss.h" /* diff --git a/security/nss/lib/ssl/ssl.h b/security/nss/lib/ssl/ssl.h index d53b9d607e8c..fc4a4a70cb0c 100644 --- a/security/nss/lib/ssl/ssl.h +++ b/security/nss/lib/ssl/ssl.h @@ -13,7 +13,7 @@ #include "prio.h" #include "seccomon.h" #include "cert.h" -#include "keyt.h" +#include "keythi.h" #include "sslt.h" /* public ssl data types */