diff options
| author |   tb <tb@openbsd.org> | 2018-05-13 13:51:22 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-05-13 13:51:22 +0000 |
| commit | e54c1916864274b30ca5bae90cd1e4f63e6e58e4 (patch) | |
| tree | 090047abf98f18044611627cc31efb416ae5256b | |
| parent | Turn CRYPTO_realloc_clean() into a recallocarray() wrapper. (diff) | |
| download | wireguard-openbsd-e54c1916864274b30ca5bae90cd1e4f63e6e58e4.tar.xz wireguard-openbsd-e54c1916864274b30ca5bae90cd1e4f63e6e58e4.zip | |
Add const qualifier to the PKCS12_SAFEBAG argument of
PKCS12_decrypt_skey(3).
tested in a bulk by sthen
ok beck, jsing
| -rw-r--r-- | lib/libcrypto/pkcs12/p12_add.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/pkcs12/pkcs12.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcrypto/pkcs12/p12_add.c b/lib/libcrypto/pkcs12/p12_add.c index 5642a141f53..3d280f9444c 100644 --- a/lib/libcrypto/pkcs12/p12_add.c +++ b/lib/libcrypto/pkcs12/p12_add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_add.c,v 1.15 2017/01/29 17:49:23 beck Exp $ */ +/* $OpenBSD: p12_add.c,v 1.16 2018/05/13 13:51:22 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -232,7 +232,7 @@ PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen) } PKCS8_PRIV_KEY_INFO * -PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass, int passlen) +PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag, const char *pass, int passlen) { return PKCS8_decrypt(bag->value.shkeybag, pass, passlen); } diff --git a/lib/libcrypto/pkcs12/pkcs12.h b/lib/libcrypto/pkcs12/pkcs12.h index c588aeb8192..f0c502796bd 100644 --- a/lib/libcrypto/pkcs12/pkcs12.h +++ b/lib/libcrypto/pkcs12/pkcs12.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs12.h,v 1.18 2018/05/13 13:46:55 tb Exp $ */ +/* $OpenBSD: pkcs12.h,v 1.19 2018/05/13 13:51:22 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -179,8 +179,8 @@ PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, int nid1, int nid2); PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8); PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen); -PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass, - int passlen); +PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag, + const char *pass, int passlen); X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, int passlen, unsigned char *salt, int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8); |