diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbev2.c')
-rw-r--r-- | src/lib/libcrypto/asn1/p5_pbev2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 9be7e0205c..155e2b0b3e 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p5_pbev2.c,v 1.23 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: p5_pbev2.c,v 1.24 2016/12/30 16:04:34 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-2004. | 3 | * project 1999-2004. |
4 | */ | 4 | */ |
@@ -265,7 +265,7 @@ PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt, | |||
265 | 265 | ||
266 | /* Encode PBE2PARAM into parameter */ | 266 | /* Encode PBE2PARAM into parameter */ |
267 | 267 | ||
268 | if (!ASN1_item_pack(pbe2, ASN1_ITEM_rptr(PBE2PARAM), | 268 | if (!ASN1_item_pack(pbe2, &PBE2PARAM_it, |
269 | &ret->parameter->value.sequence)) goto merr; | 269 | &ret->parameter->value.sequence)) goto merr; |
270 | ret->parameter->type = V_ASN1_SEQUENCE; | 270 | ret->parameter->type = V_ASN1_SEQUENCE; |
271 | 271 | ||
@@ -358,7 +358,7 @@ PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid, | |||
358 | if (!(keyfunc->parameter = ASN1_TYPE_new())) | 358 | if (!(keyfunc->parameter = ASN1_TYPE_new())) |
359 | goto merr; | 359 | goto merr; |
360 | 360 | ||
361 | if (!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM), | 361 | if (!ASN1_item_pack(kdf, &PBKDF2PARAM_it, |
362 | &keyfunc->parameter->value.sequence)) | 362 | &keyfunc->parameter->value.sequence)) |
363 | goto merr; | 363 | goto merr; |
364 | keyfunc->parameter->type = V_ASN1_SEQUENCE; | 364 | keyfunc->parameter->type = V_ASN1_SEQUENCE; |