summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7/pk7_doit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_doit.c')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_doit.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index 3e2d4c2119..1fcc37a983 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_doit.c,v 1.50 2022/12/26 07:18:52 jmc Exp $ */ 1/* $OpenBSD: pk7_doit.c,v 1.51 2023/02/16 08:38:17 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -404,7 +404,7 @@ err:
404 } 404 }
405 return (out); 405 return (out);
406} 406}
407LCRYPTO_ALIAS(PKCS7_dataInit) 407LCRYPTO_ALIAS(PKCS7_dataInit);
408 408
409static int 409static int
410pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert) 410pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
@@ -630,7 +630,7 @@ err:
630 } 630 }
631 return (out); 631 return (out);
632} 632}
633LCRYPTO_ALIAS(PKCS7_dataDecode) 633LCRYPTO_ALIAS(PKCS7_dataDecode);
634 634
635static BIO * 635static BIO *
636PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid) 636PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid)
@@ -859,7 +859,7 @@ err:
859 EVP_MD_CTX_cleanup(&ctx_tmp); 859 EVP_MD_CTX_cleanup(&ctx_tmp);
860 return (ret); 860 return (ret);
861} 861}
862LCRYPTO_ALIAS(PKCS7_dataFinal) 862LCRYPTO_ALIAS(PKCS7_dataFinal);
863 863
864int 864int
865PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) 865PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
@@ -918,7 +918,7 @@ err:
918 EVP_MD_CTX_cleanup(&mctx); 918 EVP_MD_CTX_cleanup(&mctx);
919 return 0; 919 return 0;
920} 920}
921LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_sign) 921LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_sign);
922 922
923int 923int
924PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio, 924PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
@@ -980,7 +980,7 @@ err:
980 980
981 return ret; 981 return ret;
982} 982}
983LCRYPTO_ALIAS(PKCS7_dataVerify) 983LCRYPTO_ALIAS(PKCS7_dataVerify);
984 984
985int 985int
986PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509) 986PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509)
@@ -1087,7 +1087,7 @@ err:
1087 EVP_MD_CTX_cleanup(&mdc_tmp); 1087 EVP_MD_CTX_cleanup(&mdc_tmp);
1088 return (ret); 1088 return (ret);
1089} 1089}
1090LCRYPTO_ALIAS(PKCS7_signatureVerify) 1090LCRYPTO_ALIAS(PKCS7_signatureVerify);
1091 1091
1092PKCS7_ISSUER_AND_SERIAL * 1092PKCS7_ISSUER_AND_SERIAL *
1093PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx) 1093PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
@@ -1110,21 +1110,21 @@ PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
1110 ri = sk_PKCS7_RECIP_INFO_value(rsk, idx); 1110 ri = sk_PKCS7_RECIP_INFO_value(rsk, idx);
1111 return (ri->issuer_and_serial); 1111 return (ri->issuer_and_serial);
1112} 1112}
1113LCRYPTO_ALIAS(PKCS7_get_issuer_and_serial) 1113LCRYPTO_ALIAS(PKCS7_get_issuer_and_serial);
1114 1114
1115ASN1_TYPE * 1115ASN1_TYPE *
1116PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid) 1116PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid)
1117{ 1117{
1118 return (get_attribute(si->auth_attr, nid)); 1118 return (get_attribute(si->auth_attr, nid));
1119} 1119}
1120LCRYPTO_ALIAS(PKCS7_get_signed_attribute) 1120LCRYPTO_ALIAS(PKCS7_get_signed_attribute);
1121 1121
1122ASN1_TYPE * 1122ASN1_TYPE *
1123PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) 1123PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid)
1124{ 1124{
1125 return (get_attribute(si->unauth_attr, nid)); 1125 return (get_attribute(si->unauth_attr, nid));
1126} 1126}
1127LCRYPTO_ALIAS(PKCS7_get_attribute) 1127LCRYPTO_ALIAS(PKCS7_get_attribute);
1128 1128
1129static ASN1_TYPE * 1129static ASN1_TYPE *
1130get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid) 1130get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
@@ -1155,7 +1155,7 @@ PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
1155 return NULL; 1155 return NULL;
1156 return astype->value.octet_string; 1156 return astype->value.octet_string;
1157} 1157}
1158LCRYPTO_ALIAS(PKCS7_digest_from_attributes) 1158LCRYPTO_ALIAS(PKCS7_digest_from_attributes);
1159 1159
1160int 1160int
1161PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, 1161PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
@@ -1177,7 +1177,7 @@ PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
1177 } 1177 }
1178 return (1); 1178 return (1);
1179} 1179}
1180LCRYPTO_ALIAS(PKCS7_set_signed_attributes) 1180LCRYPTO_ALIAS(PKCS7_set_signed_attributes);
1181 1181
1182int 1182int
1183PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk) 1183PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk)
@@ -1198,7 +1198,7 @@ PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk)
1198 } 1198 }
1199 return (1); 1199 return (1);
1200} 1200}
1201LCRYPTO_ALIAS(PKCS7_set_attributes) 1201LCRYPTO_ALIAS(PKCS7_set_attributes);
1202 1202
1203int 1203int
1204PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, 1204PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
@@ -1206,14 +1206,14 @@ PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
1206{ 1206{
1207 return (add_attribute(&(p7si->auth_attr), nid, atrtype, value)); 1207 return (add_attribute(&(p7si->auth_attr), nid, atrtype, value));
1208} 1208}
1209LCRYPTO_ALIAS(PKCS7_add_signed_attribute) 1209LCRYPTO_ALIAS(PKCS7_add_signed_attribute);
1210 1210
1211int 1211int
1212PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, void *value) 1212PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, void *value)
1213{ 1213{
1214 return (add_attribute(&(p7si->unauth_attr), nid, atrtype, value)); 1214 return (add_attribute(&(p7si->unauth_attr), nid, atrtype, value));
1215} 1215}
1216LCRYPTO_ALIAS(PKCS7_add_attribute) 1216LCRYPTO_ALIAS(PKCS7_add_attribute);
1217 1217
1218static int 1218static int
1219add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, void *value) 1219add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, void *value)