diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-18 11:39:00 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-18 11:39:00 +0100 |
| commit | 76fe52eb81db323ceaa8396de39b76efbce1c25e (patch) | |
| tree | 061c409281374d893f9730f89e6a4ef32d0b53f9 /security/nss/lib/pkcs7 | |
| parent | 63635e38ff9341c02fae7f4557d230ec710947b6 (diff) | |
| parent | 680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff) | |
| download | UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.gz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.lz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.xz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.zip | |
Merge branch 'master' into Basilisk-releasev2018.12.18
Diffstat (limited to 'security/nss/lib/pkcs7')
| -rw-r--r-- | security/nss/lib/pkcs7/p7decode.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/pkcs7/secmime.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/pkcs7/secpkcs7.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/security/nss/lib/pkcs7/p7decode.c b/security/nss/lib/pkcs7/p7decode.c index ba51955ab..641d201e5 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 ca1046aa5..8a4afe45b 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 78270bd15..4a88df1df 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" |