summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-05-13 13:51:22 +0000
committertb <>2018-05-13 13:51:22 +0000
commit0f5da36f22c47ea78b3f9a8090780b1ece653486 (patch)
treef1a1a7bc44c10fb9983dd2cefbe3d2a89c941373
parent97a5a388e1be5810090135a4ca7dbaa8b5d91183 (diff)
downloadopenbsd-0f5da36f22c47ea78b3f9a8090780b1ece653486.tar.gz
openbsd-0f5da36f22c47ea78b3f9a8090780b1ece653486.tar.bz2
openbsd-0f5da36f22c47ea78b3f9a8090780b1ece653486.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--src/lib/libcrypto/pkcs12/p12_add.c4
-rw-r--r--src/lib/libcrypto/pkcs12/pkcs12.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c
index 5642a141f5..3d280f9444 100644
--- a/src/lib/libcrypto/pkcs12/p12_add.c
+++ b/src/lib/libcrypto/pkcs12/p12_add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_add.c,v 1.15 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: p12_add.c,v 1.16 2018/05/13 13:51:22 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 */
@@ -232,7 +232,7 @@ PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen)
232} 232}
233 233
234PKCS8_PRIV_KEY_INFO * 234PKCS8_PRIV_KEY_INFO *
235PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass, int passlen) 235PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag, const char *pass, int passlen)
236{ 236{
237 return PKCS8_decrypt(bag->value.shkeybag, pass, passlen); 237 return PKCS8_decrypt(bag->value.shkeybag, pass, passlen);
238} 238}
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index c588aeb819..f0c502796b 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.18 2018/05/13 13:46:55 tb Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.19 2018/05/13 13:51:22 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 */
@@ -179,8 +179,8 @@ PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
179 int nid1, int nid2); 179 int nid1, int nid2);
180PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8); 180PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8);
181PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen); 181PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen);
182PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass, 182PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
183 int passlen); 183 const char *pass, int passlen);
184X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, 184X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
185 const char *pass, int passlen, unsigned char *salt, int saltlen, int iter, 185 const char *pass, int passlen, unsigned char *salt, int saltlen, int iter,
186 PKCS8_PRIV_KEY_INFO *p8); 186 PKCS8_PRIV_KEY_INFO *p8);