summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_doit.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index 5050780206..759d9dd5a5 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.53 2023/11/15 00:52:44 tb Exp $ */ 1/* $OpenBSD: pk7_doit.c,v 1.54 2023/11/15 00:55:43 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 *
@@ -403,7 +403,7 @@ err:
403 BIO_free_all(btmp); 403 BIO_free_all(btmp);
404 out = NULL; 404 out = NULL;
405 } 405 }
406 return (out); 406 return out;
407} 407}
408LCRYPTO_ALIAS(PKCS7_dataInit); 408LCRYPTO_ALIAS(PKCS7_dataInit);
409 409
@@ -632,7 +632,7 @@ err:
632 BIO_free_all(etmp); 632 BIO_free_all(etmp);
633 out = NULL; 633 out = NULL;
634 } 634 }
635 return (out); 635 return out;
636} 636}
637LCRYPTO_ALIAS(PKCS7_dataDecode); 637LCRYPTO_ALIAS(PKCS7_dataDecode);
638 638
@@ -861,7 +861,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
861 ret = 1; 861 ret = 1;
862err: 862err:
863 EVP_MD_CTX_cleanup(&ctx_tmp); 863 EVP_MD_CTX_cleanup(&ctx_tmp);
864 return (ret); 864 return ret;
865} 865}
866LCRYPTO_ALIAS(PKCS7_dataFinal); 866LCRYPTO_ALIAS(PKCS7_dataFinal);
867 867
@@ -1089,7 +1089,7 @@ PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509)
1089 ret = 1; 1089 ret = 1;
1090err: 1090err:
1091 EVP_MD_CTX_cleanup(&mdc_tmp); 1091 EVP_MD_CTX_cleanup(&mdc_tmp);
1092 return (ret); 1092 return ret;
1093} 1093}
1094LCRYPTO_ALIAS(PKCS7_signatureVerify); 1094LCRYPTO_ALIAS(PKCS7_signatureVerify);
1095 1095
@@ -1110,9 +1110,9 @@ PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
1110 return NULL; 1110 return NULL;
1111 ri = sk_PKCS7_RECIP_INFO_value(rsk, 0); 1111 ri = sk_PKCS7_RECIP_INFO_value(rsk, 0);
1112 if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx) 1112 if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx)
1113 return (NULL); 1113 return NULL;
1114 ri = sk_PKCS7_RECIP_INFO_value(rsk, idx); 1114 ri = sk_PKCS7_RECIP_INFO_value(rsk, idx);
1115 return (ri->issuer_and_serial); 1115 return ri->issuer_and_serial;
1116} 1116}
1117LCRYPTO_ALIAS(PKCS7_get_issuer_and_serial); 1117LCRYPTO_ALIAS(PKCS7_get_issuer_and_serial);
1118 1118
@@ -1125,26 +1125,26 @@ get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
1125 1125
1126 o = OBJ_nid2obj(nid); 1126 o = OBJ_nid2obj(nid);
1127 if (!o || !sk) 1127 if (!o || !sk)
1128 return (NULL); 1128 return NULL;
1129 for (i = 0; i < sk_X509_ATTRIBUTE_num(sk); i++) { 1129 for (i = 0; i < sk_X509_ATTRIBUTE_num(sk); i++) {
1130 xa = sk_X509_ATTRIBUTE_value(sk, i); 1130 xa = sk_X509_ATTRIBUTE_value(sk, i);
1131 if (OBJ_cmp(xa->object, o) == 0) 1131 if (OBJ_cmp(xa->object, o) == 0)
1132 return (sk_ASN1_TYPE_value(xa->set, 0)); 1132 return sk_ASN1_TYPE_value(xa->set, 0);
1133 } 1133 }
1134 return (NULL); 1134 return NULL;
1135} 1135}
1136 1136
1137ASN1_TYPE * 1137ASN1_TYPE *
1138PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid) 1138PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid)
1139{ 1139{
1140 return (get_attribute(si->auth_attr, nid)); 1140 return get_attribute(si->auth_attr, nid);
1141} 1141}
1142LCRYPTO_ALIAS(PKCS7_get_signed_attribute); 1142LCRYPTO_ALIAS(PKCS7_get_signed_attribute);
1143 1143
1144ASN1_TYPE * 1144ASN1_TYPE *
1145PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) 1145PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid)
1146{ 1146{
1147 return (get_attribute(si->unauth_attr, nid)); 1147 return get_attribute(si->unauth_attr, nid);
1148} 1148}
1149LCRYPTO_ALIAS(PKCS7_get_attribute); 1149LCRYPTO_ALIAS(PKCS7_get_attribute);
1150 1150
@@ -1177,9 +1177,9 @@ PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
1177 if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr, i, 1177 if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr, i,
1178 X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk, i)))) 1178 X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk, i))))
1179 == NULL) 1179 == NULL)
1180 return (0); 1180 return 0;
1181 } 1181 }
1182 return (1); 1182 return 1;
1183} 1183}
1184LCRYPTO_ALIAS(PKCS7_set_signed_attributes); 1184LCRYPTO_ALIAS(PKCS7_set_signed_attributes);
1185 1185
@@ -1198,9 +1198,9 @@ PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk)
1198 if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr, i, 1198 if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr, i,
1199 X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk, i)))) 1199 X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk, i))))
1200 == NULL) 1200 == NULL)
1201 return (0); 1201 return 0;
1202 } 1202 }
1203 return (1); 1203 return 1;
1204} 1204}
1205LCRYPTO_ALIAS(PKCS7_set_attributes); 1205LCRYPTO_ALIAS(PKCS7_set_attributes);
1206 1206
@@ -1241,20 +1241,20 @@ new_attrib:
1241 goto new_attrib; 1241 goto new_attrib;
1242 } 1242 }
1243end: 1243end:
1244 return (1); 1244 return 1;
1245} 1245}
1246 1246
1247int 1247int
1248PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, 1248PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
1249 void *value) 1249 void *value)
1250{ 1250{
1251 return (add_attribute(&(p7si->auth_attr), nid, atrtype, value)); 1251 return add_attribute(&(p7si->auth_attr), nid, atrtype, value);
1252} 1252}
1253LCRYPTO_ALIAS(PKCS7_add_signed_attribute); 1253LCRYPTO_ALIAS(PKCS7_add_signed_attribute);
1254 1254
1255int 1255int
1256PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, void *value) 1256PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, void *value)
1257{ 1257{
1258 return (add_attribute(&(p7si->unauth_attr), nid, atrtype, value)); 1258 return add_attribute(&(p7si->unauth_attr), nid, atrtype, value);
1259} 1259}
1260LCRYPTO_ALIAS(PKCS7_add_attribute); 1260LCRYPTO_ALIAS(PKCS7_add_attribute);