summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/pkcs12/pkcs12.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index 6061bef185..2d7cf24849 100644
--- a/src/lib/libcrypto/pkcs12/pkcs12.h
+++ b/src/lib/libcrypto/pkcs12/pkcs12.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.h,v 1.14 2016/09/04 17:19:33 jsing Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.15 2016/12/27 15:31:16 jsing 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 */
@@ -255,8 +255,8 @@ PKCS12_BAGS *d2i_PKCS12_BAGS(PKCS12_BAGS **a, const unsigned char **in, long len
255int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out); 255int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out);
256extern const ASN1_ITEM PKCS12_BAGS_it; 256extern const ASN1_ITEM PKCS12_BAGS_it;
257 257
258DECLARE_ASN1_ITEM(PKCS12_SAFEBAGS) 258extern const ASN1_ITEM PKCS12_SAFEBAGS_it;
259DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES) 259extern const ASN1_ITEM PKCS12_AUTHSAFES_it;
260 260
261void PKCS12_PBE_add(void); 261void PKCS12_PBE_add(void);
262int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, 262int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,