diff options
author | jsing <> | 2016-12-30 15:38:13 +0000 |
---|---|---|
committer | jsing <> | 2016-12-30 15:38:13 +0000 |
commit | 839da8fff8567f7cd4ca2db04b35ff34048ddb4c (patch) | |
tree | 504f0cb89b43c50cb0a2a5677649170a8b6c460e /src/lib/libcrypto/pkcs12/p12_add.c | |
parent | c592ddf845454b07eca995ae32ea87dc1eeb9719 (diff) | |
download | openbsd-839da8fff8567f7cd4ca2db04b35ff34048ddb4c.tar.gz openbsd-839da8fff8567f7cd4ca2db04b35ff34048ddb4c.tar.bz2 openbsd-839da8fff8567f7cd4ca2db04b35ff34048ddb4c.zip |
Expand ASN1_ITEM_rptr macros - no change in generated assembly.
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_add.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_add.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c index cb7f72b365..954ca03ebb 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.13 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: p12_add.c,v 1.14 2016/12/30 15:34:35 jsing 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 | */ |
@@ -156,7 +156,7 @@ PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk) | |||
156 | goto err; | 156 | goto err; |
157 | } | 157 | } |
158 | 158 | ||
159 | if (!ASN1_item_pack(sk, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), &p7->d.data)) { | 159 | if (!ASN1_item_pack(sk, &PKCS12_SAFEBAGS_it, &p7->d.data)) { |
160 | PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, | 160 | PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, |
161 | PKCS12_R_CANT_PACK_STRUCTURE); | 161 | PKCS12_R_CANT_PACK_STRUCTURE); |
162 | goto err; | 162 | goto err; |
@@ -177,7 +177,7 @@ PKCS12_unpack_p7data(PKCS7 *p7) | |||
177 | PKCS12_R_CONTENT_TYPE_NOT_DATA); | 177 | PKCS12_R_CONTENT_TYPE_NOT_DATA); |
178 | return NULL; | 178 | return NULL; |
179 | } | 179 | } |
180 | return ASN1_item_unpack(p7->d.data, ASN1_ITEM_rptr(PKCS12_SAFEBAGS)); | 180 | return ASN1_item_unpack(p7->d.data, &PKCS12_SAFEBAGS_it); |
181 | } | 181 | } |
182 | 182 | ||
183 | /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */ | 183 | /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */ |
@@ -215,7 +215,7 @@ PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen, | |||
215 | p7->d.encrypted->enc_data->algorithm = pbe; | 215 | p7->d.encrypted->enc_data->algorithm = pbe; |
216 | ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data); | 216 | ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data); |
217 | if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt( | 217 | if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt( |
218 | pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass, passlen, bags, 1))) { | 218 | pbe, &PKCS12_SAFEBAGS_it, pass, passlen, bags, 1))) { |
219 | PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, | 219 | PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, |
220 | PKCS12_R_ENCRYPT_ERROR); | 220 | PKCS12_R_ENCRYPT_ERROR); |
221 | goto err; | 221 | goto err; |
@@ -234,7 +234,7 @@ PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen) | |||
234 | if (!PKCS7_type_is_encrypted(p7)) | 234 | if (!PKCS7_type_is_encrypted(p7)) |
235 | return NULL; | 235 | return NULL; |
236 | return PKCS12_item_decrypt_d2i(p7->d.encrypted->enc_data->algorithm, | 236 | return PKCS12_item_decrypt_d2i(p7->d.encrypted->enc_data->algorithm, |
237 | ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass, passlen, | 237 | &PKCS12_SAFEBAGS_it, pass, passlen, |
238 | p7->d.encrypted->enc_data->enc_data, 1); | 238 | p7->d.encrypted->enc_data->enc_data, 1); |
239 | } | 239 | } |
240 | 240 | ||
@@ -247,7 +247,7 @@ PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass, int passlen) | |||
247 | int | 247 | int |
248 | PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes) | 248 | PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes) |
249 | { | 249 | { |
250 | if (ASN1_item_pack(safes, ASN1_ITEM_rptr(PKCS12_AUTHSAFES), | 250 | if (ASN1_item_pack(safes, &PKCS12_AUTHSAFES_it, |
251 | &p12->authsafes->d.data)) | 251 | &p12->authsafes->d.data)) |
252 | return 1; | 252 | return 1; |
253 | return 0; | 253 | return 0; |
@@ -262,5 +262,5 @@ PKCS12_unpack_authsafes(PKCS12 *p12) | |||
262 | return NULL; | 262 | return NULL; |
263 | } | 263 | } |
264 | return ASN1_item_unpack(p12->authsafes->d.data, | 264 | return ASN1_item_unpack(p12->authsafes->d.data, |
265 | ASN1_ITEM_rptr(PKCS12_AUTHSAFES)); | 265 | &PKCS12_AUTHSAFES_it); |
266 | } | 266 | } |