summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-05-13 14:24:07 +0000
committertb <>2018-05-13 14:24:07 +0000
commitd681e6eec2d10bffe7d360d9b1a4579a3df6c459 (patch)
tree3bd77f65dbec14773d960d6d1858e11cc8ae7007
parentd6bc8229eae5cad51aab8f78d41e927256d47f6f (diff)
downloadopenbsd-d681e6eec2d10bffe7d360d9b1a4579a3df6c459.tar.gz
openbsd-d681e6eec2d10bffe7d360d9b1a4579a3df6c459.tar.bz2
openbsd-d681e6eec2d10bffe7d360d9b1a4579a3df6c459.zip
Add const to the argument of PKCS12_pack_authsafes(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.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c
index 3d280f9444..08bb75d312 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.16 2018/05/13 13:51:22 tb Exp $ */ 1/* $OpenBSD: p12_add.c,v 1.17 2018/05/13 14:24:07 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 */
@@ -247,7 +247,7 @@ PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes)
247} 247}
248 248
249STACK_OF(PKCS7) * 249STACK_OF(PKCS7) *
250PKCS12_unpack_authsafes(PKCS12 *p12) 250PKCS12_unpack_authsafes(const PKCS12 *p12)
251{ 251{
252 if (!PKCS7_type_is_data(p12->authsafes)) { 252 if (!PKCS7_type_is_data(p12->authsafes)) {
253 PKCS12error(PKCS12_R_CONTENT_TYPE_NOT_DATA); 253 PKCS12error(PKCS12_R_CONTENT_TYPE_NOT_DATA);
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index a598eb4f9e..9c2048e7d7 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.21 2018/05/13 14:22:34 tb Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.22 2018/05/13 14:24:07 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 */
@@ -195,7 +195,7 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
195 int passlen); 195 int passlen);
196 196
197int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes); 197int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes);
198STACK_OF(PKCS7) *PKCS12_unpack_authsafes(PKCS12 *p12); 198STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12);
199 199
200int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, 200int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
201 int namelen); 201 int namelen);