diff options
author | tb <> | 2018-05-13 14:15:01 +0000 |
---|---|---|
committer | tb <> | 2018-05-13 14:15:01 +0000 |
commit | 1787201039222c55ba78b6dfafce65a370d5012d (patch) | |
tree | 27ee549a5e22db406579d596c9077f918bea574a | |
parent | 67c808053a4366338c432c97104bd025b5038bca (diff) | |
download | openbsd-1787201039222c55ba78b6dfafce65a370d5012d.tar.gz openbsd-1787201039222c55ba78b6dfafce65a370d5012d.tar.bz2 openbsd-1787201039222c55ba78b6dfafce65a370d5012d.zip |
Add const to the attr argument of PKCS12_get_attr_gen(3).
tested in a bulk by sthen
ok beck, jsing
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_attr.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/pkcs12.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c index 7552cf0a60..78d510b100 100644 --- a/src/lib/libcrypto/pkcs12/p12_attr.c +++ b/src/lib/libcrypto/pkcs12/p12_attr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_attr.c,v 1.10 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: p12_attr.c,v 1.11 2018/05/13 14:15:01 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 | */ |
@@ -122,7 +122,7 @@ PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen) | |||
122 | } | 122 | } |
123 | 123 | ||
124 | ASN1_TYPE * | 124 | ASN1_TYPE * |
125 | PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid) | 125 | PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid) |
126 | { | 126 | { |
127 | X509_ATTRIBUTE *attrib; | 127 | X509_ATTRIBUTE *attrib; |
128 | int i; | 128 | int i; |
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h index f0c502796b..d6ee0d9a6f 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.19 2018/05/13 13:51:22 tb Exp $ */ | 1 | /* $OpenBSD: pkcs12.h,v 1.20 2018/05/13 14:15:01 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 | */ |
@@ -206,7 +206,8 @@ int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, | |||
206 | int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name, | 206 | int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name, |
207 | int namelen); | 207 | int namelen); |
208 | int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage); | 208 | int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage); |
209 | ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid); | 209 | ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, |
210 | int attr_nid); | ||
210 | char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag); | 211 | char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag); |
211 | unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, | 212 | unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, |
212 | int passlen, unsigned char *in, int inlen, unsigned char **data, | 213 | int passlen, unsigned char *in, int inlen, unsigned char **data, |