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/pkcs7/pk7_attr.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/pkcs7/pk7_attr.c')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_attr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_attr.c b/src/lib/libcrypto/pkcs7/pk7_attr.c index 554a47673b..07722f98e1 100644 --- a/src/lib/libcrypto/pkcs7/pk7_attr.c +++ b/src/lib/libcrypto/pkcs7/pk7_attr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_attr.c,v 1.10 2014/10/28 05:46:56 miod Exp $ */ | 1 | /* $OpenBSD: pk7_attr.c,v 1.11 2016/12/30 15:38:13 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 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -76,7 +76,7 @@ PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap) | |||
76 | return 0; | 76 | return 0; |
77 | } | 77 | } |
78 | seq->length = ASN1_item_i2d((ASN1_VALUE *)cap, &seq->data, | 78 | seq->length = ASN1_item_i2d((ASN1_VALUE *)cap, &seq->data, |
79 | ASN1_ITEM_rptr(X509_ALGORS)); | 79 | &X509_ALGORS_it); |
80 | return PKCS7_add_signed_attribute(si, NID_SMIMECapabilities, | 80 | return PKCS7_add_signed_attribute(si, NID_SMIMECapabilities, |
81 | V_ASN1_SEQUENCE, seq); | 81 | V_ASN1_SEQUENCE, seq); |
82 | } | 82 | } |
@@ -93,7 +93,7 @@ PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si) | |||
93 | p = cap->value.sequence->data; | 93 | p = cap->value.sequence->data; |
94 | return (STACK_OF(X509_ALGOR) *) | 94 | return (STACK_OF(X509_ALGOR) *) |
95 | ASN1_item_d2i(NULL, &p, cap->value.sequence->length, | 95 | ASN1_item_d2i(NULL, &p, cap->value.sequence->length, |
96 | ASN1_ITEM_rptr(X509_ALGORS)); | 96 | &X509_ALGORS_it); |
97 | } | 97 | } |
98 | 98 | ||
99 | /* Basic smime-capabilities OID and optional integer arg */ | 99 | /* Basic smime-capabilities OID and optional integer arg */ |