diff options
author | Joel Sing <jsing@cvs.openbsd.org> | 2019-08-11 10:15:31 +0000 |
---|---|---|
committer | Joel Sing <jsing@cvs.openbsd.org> | 2019-08-11 10:15:31 +0000 |
commit | 971b3acd8a62b0bb0f8e2b65f9df5e489a2c8efc (patch) | |
tree | f4e02f68d6aca1e01080feb01bf80397123a890e /lib/libcrypto/cms/cms_pwri.c | |
parent | 8399dd5e9deda4c73ca24f242031680bf9977a75 (diff) |
Expand ASN.1 macros.
Diffstat (limited to 'lib/libcrypto/cms/cms_pwri.c')
-rw-r--r-- | lib/libcrypto/cms/cms_pwri.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libcrypto/cms/cms_pwri.c b/lib/libcrypto/cms/cms_pwri.c index bbad379dff1..a3251f58b74 100644 --- a/lib/libcrypto/cms/cms_pwri.c +++ b/lib/libcrypto/cms/cms_pwri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_pwri.c,v 1.18 2019/08/11 06:47:18 jsing Exp $ */ +/* $OpenBSD: cms_pwri.c,v 1.19 2019/08/11 10:15:30 jsing Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -179,7 +179,7 @@ CMS_add0_recipient_password(CMS_ContentInfo *cms, int iter, int wrap_nid, if (pwri->keyEncryptionAlgorithm->parameter == NULL) goto merr; - if (!ASN1_item_pack(encalg, ASN1_ITEM_rptr(X509_ALGOR), + if (!ASN1_item_pack(encalg, &X509_ALGOR_it, &pwri->keyEncryptionAlgorithm->parameter->value.sequence)) goto merr; pwri->keyEncryptionAlgorithm->parameter->type = V_ASN1_SEQUENCE; @@ -350,7 +350,7 @@ cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri, return 0; } - kekalg = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR), + kekalg = ASN1_TYPE_unpack_sequence(&X509_ALGOR_it, algtmp->parameter); if (kekalg == NULL) { |