summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/pkcs12.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/pkcs12.h')
-rw-r--r--src/lib/libcrypto/pkcs12/pkcs12.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index d6ee0d9a6f..a598eb4f9e 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.20 2018/05/13 14:15:01 tb Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.21 2018/05/13 14:22:34 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 */
@@ -209,11 +209,11 @@ int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
209ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, 209ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs,
210 int attr_nid); 210 int attr_nid);
211char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag); 211char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
212unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, 212unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor, const char *pass,
213 int passlen, unsigned char *in, int inlen, unsigned char **data, 213 int passlen, const unsigned char *in, int inlen, unsigned char **data,
214 int *datalen, int en_de); 214 int *datalen, int en_de);
215void * PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, 215void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
216 const char *pass, int passlen, ASN1_OCTET_STRING *oct, int zbuf); 216 const char *pass, int passlen, const ASN1_OCTET_STRING *oct, int zbuf);
217ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, 217ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
218 const ASN1_ITEM *it, const char *pass, int passlen, void *obj, int zbuf); 218 const ASN1_ITEM *it, const char *pass, int passlen, void *obj, int zbuf);
219PKCS12 *PKCS12_init(int mode); 219PKCS12 *PKCS12_init(int mode);
@@ -280,7 +280,7 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
280int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12); 280int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
281PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12); 281PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
282PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12); 282PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
283int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass); 283int PKCS12_newpass(PKCS12 *p12, const char *oldpass, const char *newpass);
284 284
285/* BEGIN ERROR CODES */ 285/* BEGIN ERROR CODES */
286/* The following lines are auto generated by the script mkerr.pl. Any changes 286/* The following lines are auto generated by the script mkerr.pl. Any changes