diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_attr.c')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_attr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_attr.c b/src/lib/libcrypto/pkcs7/pk7_attr.c index 1a5dc06dc5..5eff5241ef 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.13 2022/11/12 12:11:14 beck Exp $ */ | 1 | /* $OpenBSD: pk7_attr.c,v 1.14 2023/02/16 08:38:17 tb 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 | */ |
@@ -79,7 +79,7 @@ PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap) | |||
79 | return PKCS7_add_signed_attribute(si, NID_SMIMECapabilities, | 79 | return PKCS7_add_signed_attribute(si, NID_SMIMECapabilities, |
80 | V_ASN1_SEQUENCE, seq); | 80 | V_ASN1_SEQUENCE, seq); |
81 | } | 81 | } |
82 | LCRYPTO_ALIAS(PKCS7_add_attrib_smimecap) | 82 | LCRYPTO_ALIAS(PKCS7_add_attrib_smimecap); |
83 | 83 | ||
84 | STACK_OF(X509_ALGOR) * | 84 | STACK_OF(X509_ALGOR) * |
85 | PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si) | 85 | PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si) |
@@ -95,7 +95,7 @@ PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si) | |||
95 | ASN1_item_d2i(NULL, &p, cap->value.sequence->length, | 95 | ASN1_item_d2i(NULL, &p, cap->value.sequence->length, |
96 | &X509_ALGORS_it); | 96 | &X509_ALGORS_it); |
97 | } | 97 | } |
98 | LCRYPTO_ALIAS(PKCS7_get_smimecap) | 98 | LCRYPTO_ALIAS(PKCS7_get_smimecap); |
99 | 99 | ||
100 | /* Basic smime-capabilities OID and optional integer arg */ | 100 | /* Basic smime-capabilities OID and optional integer arg */ |
101 | int | 101 | int |
@@ -132,7 +132,7 @@ err: | |||
132 | X509_ALGOR_free(alg); | 132 | X509_ALGOR_free(alg); |
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |
135 | LCRYPTO_ALIAS(PKCS7_simple_smimecap) | 135 | LCRYPTO_ALIAS(PKCS7_simple_smimecap); |
136 | 136 | ||
137 | int | 137 | int |
138 | PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid) | 138 | PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid) |
@@ -144,7 +144,7 @@ PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid) | |||
144 | return PKCS7_add_signed_attribute(si, NID_pkcs9_contentType, | 144 | return PKCS7_add_signed_attribute(si, NID_pkcs9_contentType, |
145 | V_ASN1_OBJECT, coid); | 145 | V_ASN1_OBJECT, coid); |
146 | } | 146 | } |
147 | LCRYPTO_ALIAS(PKCS7_add_attrib_content_type) | 147 | LCRYPTO_ALIAS(PKCS7_add_attrib_content_type); |
148 | 148 | ||
149 | int | 149 | int |
150 | PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t) | 150 | PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t) |
@@ -156,7 +156,7 @@ PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t) | |||
156 | return PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime, | 156 | return PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime, |
157 | V_ASN1_UTCTIME, t); | 157 | V_ASN1_UTCTIME, t); |
158 | } | 158 | } |
159 | LCRYPTO_ALIAS(PKCS7_add0_attrib_signing_time) | 159 | LCRYPTO_ALIAS(PKCS7_add0_attrib_signing_time); |
160 | 160 | ||
161 | int | 161 | int |
162 | PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si, const unsigned char *md, | 162 | PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si, const unsigned char *md, |
@@ -175,4 +175,4 @@ PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si, const unsigned char *md, | |||
175 | } | 175 | } |
176 | return 1; | 176 | return 1; |
177 | } | 177 | } |
178 | LCRYPTO_ALIAS(PKCS7_add1_attrib_digest) | 178 | LCRYPTO_ALIAS(PKCS7_add1_attrib_digest); |