projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial, incomplete support for typesafe macros without using function
[openssl.git]
/
crypto
/
asn1
/
p5_pbev2.c
diff --git
a/crypto/asn1/p5_pbev2.c
b/crypto/asn1/p5_pbev2.c
index 3c1db8afcc1597697d0c4160b9b1ad25bd9240e0..6724a3ec5df03e365635fceae1b9691a050b6dac 100644
(file)
--- a/
crypto/asn1/p5_pbev2.c
+++ b/
crypto/asn1/p5_pbev2.c
@@
-188,7
+188,7
@@
X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
if(!(pbe2->keyfunc->parameter = ASN1_TYPE_new())) goto merr;
if(!(pbe2->keyfunc->parameter = ASN1_TYPE_new())) goto merr;
- if(!ASN1_
pack_string_of(PBKDF2PARAM, kdf, i2d_PBKDF2PARAM
,
+ if(!ASN1_
item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM)
,
&pbe2->keyfunc->parameter->value.sequence)) goto merr;
pbe2->keyfunc->parameter->type = V_ASN1_SEQUENCE;
&pbe2->keyfunc->parameter->value.sequence)) goto merr;
pbe2->keyfunc->parameter->type = V_ASN1_SEQUENCE;
@@
-204,7
+204,7
@@
X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
/* Encode PBE2PARAM into parameter */
/* Encode PBE2PARAM into parameter */
- if(!ASN1_
pack_string_of(PBE2PARAM, pbe2, i2d_PBE2PARAM
,
+ if(!ASN1_
item_pack(pbe2, ASN1_ITEM_rptr(PBE2PARAM)
,
&ret->parameter->value.sequence)) goto merr;
ret->parameter->type = V_ASN1_SEQUENCE;
&ret->parameter->value.sequence)) goto merr;
ret->parameter->type = V_ASN1_SEQUENCE;