diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_attr.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_mutl.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_npas.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_p8d.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_p8e.c | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c index e8e340a2e2..dc38b7c897 100644 --- a/src/lib/libcrypto/pkcs12/p12_attr.c +++ b/src/lib/libcrypto/pkcs12/p12_attr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_attr.c,v 1.13 2021/07/09 14:07:59 tb Exp $ */ | 1 | /* $OpenBSD: p12_attr.c,v 1.14 2021/11/01 20:53:08 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -60,6 +60,8 @@ | |||
60 | 60 | ||
61 | #include <openssl/pkcs12.h> | 61 | #include <openssl/pkcs12.h> |
62 | 62 | ||
63 | #include "x509_lcl.h" | ||
64 | |||
63 | /* Add a local keyid to a safebag */ | 65 | /* Add a local keyid to a safebag */ |
64 | 66 | ||
65 | int | 67 | int |
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c index d45ab078fd..14ded8532d 100644 --- a/src/lib/libcrypto/pkcs12/p12_mutl.c +++ b/src/lib/libcrypto/pkcs12/p12_mutl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_mutl.c,v 1.24 2021/07/09 14:08:00 tb Exp $ */ | 1 | /* $OpenBSD: p12_mutl.c,v 1.25 2021/11/01 20:53:08 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -68,6 +68,8 @@ | |||
68 | #include <openssl/hmac.h> | 68 | #include <openssl/hmac.h> |
69 | #include <openssl/pkcs12.h> | 69 | #include <openssl/pkcs12.h> |
70 | 70 | ||
71 | #include "x509_lcl.h" | ||
72 | |||
71 | /* Generate a MAC */ | 73 | /* Generate a MAC */ |
72 | int | 74 | int |
73 | PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, | 75 | PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, |
diff --git a/src/lib/libcrypto/pkcs12/p12_npas.c b/src/lib/libcrypto/pkcs12/p12_npas.c index d6b12edab3..62ec368af7 100644 --- a/src/lib/libcrypto/pkcs12/p12_npas.c +++ b/src/lib/libcrypto/pkcs12/p12_npas.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_npas.c,v 1.13 2018/05/13 14:22:34 tb Exp $ */ | 1 | /* $OpenBSD: p12_npas.c,v 1.14 2021/11/01 20:53:08 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -63,6 +63,8 @@ | |||
63 | #include <openssl/err.h> | 63 | #include <openssl/err.h> |
64 | #include <openssl/pkcs12.h> | 64 | #include <openssl/pkcs12.h> |
65 | 65 | ||
66 | #include "x509_lcl.h" | ||
67 | |||
66 | /* PKCS#12 password change routine */ | 68 | /* PKCS#12 password change routine */ |
67 | 69 | ||
68 | static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass); | 70 | static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass); |
diff --git a/src/lib/libcrypto/pkcs12/p12_p8d.c b/src/lib/libcrypto/pkcs12/p12_p8d.c index 0286d4acf5..ce1b28bc29 100644 --- a/src/lib/libcrypto/pkcs12/p12_p8d.c +++ b/src/lib/libcrypto/pkcs12/p12_p8d.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_p8d.c,v 1.7 2018/05/13 14:28:14 tb Exp $ */ | 1 | /* $OpenBSD: p12_p8d.c,v 1.8 2021/11/01 20:53:08 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -60,6 +60,8 @@ | |||
60 | 60 | ||
61 | #include <openssl/pkcs12.h> | 61 | #include <openssl/pkcs12.h> |
62 | 62 | ||
63 | #include "x509_lcl.h" | ||
64 | |||
63 | PKCS8_PRIV_KEY_INFO * | 65 | PKCS8_PRIV_KEY_INFO * |
64 | PKCS8_decrypt(const X509_SIG *p8, const char *pass, int passlen) | 66 | PKCS8_decrypt(const X509_SIG *p8, const char *pass, int passlen) |
65 | { | 67 | { |
diff --git a/src/lib/libcrypto/pkcs12/p12_p8e.c b/src/lib/libcrypto/pkcs12/p12_p8e.c index 5e3fc6486a..7f5f61d69f 100644 --- a/src/lib/libcrypto/pkcs12/p12_p8e.c +++ b/src/lib/libcrypto/pkcs12/p12_p8e.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_p8e.c,v 1.8 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: p12_p8e.c,v 1.9 2021/11/01 20:53:08 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -61,6 +61,8 @@ | |||
61 | #include <openssl/err.h> | 61 | #include <openssl/err.h> |
62 | #include <openssl/pkcs12.h> | 62 | #include <openssl/pkcs12.h> |
63 | 63 | ||
64 | #include "x509_lcl.h" | ||
65 | |||
64 | X509_SIG * | 66 | X509_SIG * |
65 | PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, | 67 | PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, |
66 | int passlen, unsigned char *salt, int saltlen, int iter, | 68 | int passlen, unsigned char *salt, int saltlen, int iter, |