summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-05-13 14:28:14 +0000
committertb <>2018-05-13 14:28:14 +0000
commitfc38dcf6c18f2d74eb64743f1a0f4e671fcdde8e (patch)
tree17f4dd2e291caf1c667d57094fb7c30473380e86
parent910c797f5458fa5fa1d7d4cd4adc17506b949283 (diff)
downloadopenbsd-fc38dcf6c18f2d74eb64743f1a0f4e671fcdde8e.tar.gz
openbsd-fc38dcf6c18f2d74eb64743f1a0f4e671fcdde8e.tar.bz2
openbsd-fc38dcf6c18f2d74eb64743f1a0f4e671fcdde8e.zip
Add const qualifiers to the X509_SIG * and char * arguments of
PKCS8_decrypt(3). tested in a bulk build by sthen ok beck, jsing
-rw-r--r--src/lib/libcrypto/pkcs12/p12_p8d.c4
-rw-r--r--src/lib/libcrypto/pkcs12/pkcs12.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_p8d.c b/src/lib/libcrypto/pkcs12/p12_p8d.c
index 68af6bf5b5..0286d4acf5 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.6 2016/12/30 15:34:35 jsing Exp $ */ 1/* $OpenBSD: p12_p8d.c,v 1.7 2018/05/13 14:28:14 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,7 +61,7 @@
61#include <openssl/pkcs12.h> 61#include <openssl/pkcs12.h>
62 62
63PKCS8_PRIV_KEY_INFO * 63PKCS8_PRIV_KEY_INFO *
64PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen) 64PKCS8_decrypt(const X509_SIG *p8, const char *pass, int passlen)
65{ 65{
66 return PKCS12_item_decrypt_d2i(p8->algor, 66 return PKCS12_item_decrypt_d2i(p8->algor,
67 &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8->digest, 1); 67 &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8->digest, 1);
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index 9c2048e7d7..64a70f28e4 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.22 2018/05/13 14:24:07 tb Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.23 2018/05/13 14:28:14 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 */
@@ -178,7 +178,8 @@ X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag);
178PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, 178PKCS12_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(const X509_SIG *p8, const char *pass,
182 int passlen);
182PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag, 183PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
183 const char *pass, int passlen); 184 const char *pass, int passlen);
184X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, 185X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,