diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_doit.c')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index b314069610..643cb4ce35 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.47 2022/05/09 19:19:33 jsing Exp $ */ | 1 | /* $OpenBSD: pk7_doit.c,v 1.48 2022/11/12 12:11:14 beck 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,6 +404,7 @@ err: | |||
404 | } | 404 | } |
405 | return (out); | 405 | return (out); |
406 | } | 406 | } |
407 | LCRYPTO_ALIAS(PKCS7_dataInit) | ||
407 | 408 | ||
408 | static int | 409 | static int |
409 | pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert) | 410 | pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert) |
@@ -629,6 +630,7 @@ err: | |||
629 | } | 630 | } |
630 | return (out); | 631 | return (out); |
631 | } | 632 | } |
633 | LCRYPTO_ALIAS(PKCS7_dataDecode) | ||
632 | 634 | ||
633 | static BIO * | 635 | static BIO * |
634 | PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid) | 636 | PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid) |
@@ -857,6 +859,7 @@ err: | |||
857 | EVP_MD_CTX_cleanup(&ctx_tmp); | 859 | EVP_MD_CTX_cleanup(&ctx_tmp); |
858 | return (ret); | 860 | return (ret); |
859 | } | 861 | } |
862 | LCRYPTO_ALIAS(PKCS7_dataFinal) | ||
860 | 863 | ||
861 | int | 864 | int |
862 | PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) | 865 | PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) |
@@ -915,6 +918,7 @@ err: | |||
915 | EVP_MD_CTX_cleanup(&mctx); | 918 | EVP_MD_CTX_cleanup(&mctx); |
916 | return 0; | 919 | return 0; |
917 | } | 920 | } |
921 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_sign) | ||
918 | 922 | ||
919 | int | 923 | int |
920 | PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio, | 924 | PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio, |
@@ -976,6 +980,7 @@ err: | |||
976 | 980 | ||
977 | return ret; | 981 | return ret; |
978 | } | 982 | } |
983 | LCRYPTO_ALIAS(PKCS7_dataVerify) | ||
979 | 984 | ||
980 | int | 985 | int |
981 | PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509) | 986 | PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509) |
@@ -1082,6 +1087,7 @@ err: | |||
1082 | EVP_MD_CTX_cleanup(&mdc_tmp); | 1087 | EVP_MD_CTX_cleanup(&mdc_tmp); |
1083 | return (ret); | 1088 | return (ret); |
1084 | } | 1089 | } |
1090 | LCRYPTO_ALIAS(PKCS7_signatureVerify) | ||
1085 | 1091 | ||
1086 | PKCS7_ISSUER_AND_SERIAL * | 1092 | PKCS7_ISSUER_AND_SERIAL * |
1087 | PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx) | 1093 | PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx) |
@@ -1104,18 +1110,21 @@ PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx) | |||
1104 | ri = sk_PKCS7_RECIP_INFO_value(rsk, idx); | 1110 | ri = sk_PKCS7_RECIP_INFO_value(rsk, idx); |
1105 | return (ri->issuer_and_serial); | 1111 | return (ri->issuer_and_serial); |
1106 | } | 1112 | } |
1113 | LCRYPTO_ALIAS(PKCS7_get_issuer_and_serial) | ||
1107 | 1114 | ||
1108 | ASN1_TYPE * | 1115 | ASN1_TYPE * |
1109 | PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid) | 1116 | PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid) |
1110 | { | 1117 | { |
1111 | return (get_attribute(si->auth_attr, nid)); | 1118 | return (get_attribute(si->auth_attr, nid)); |
1112 | } | 1119 | } |
1120 | LCRYPTO_ALIAS(PKCS7_get_signed_attribute) | ||
1113 | 1121 | ||
1114 | ASN1_TYPE * | 1122 | ASN1_TYPE * |
1115 | PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) | 1123 | PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) |
1116 | { | 1124 | { |
1117 | return (get_attribute(si->unauth_attr, nid)); | 1125 | return (get_attribute(si->unauth_attr, nid)); |
1118 | } | 1126 | } |
1127 | LCRYPTO_ALIAS(PKCS7_get_attribute) | ||
1119 | 1128 | ||
1120 | static ASN1_TYPE * | 1129 | static ASN1_TYPE * |
1121 | get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid) | 1130 | get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid) |
@@ -1146,6 +1155,7 @@ PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk) | |||
1146 | return NULL; | 1155 | return NULL; |
1147 | return astype->value.octet_string; | 1156 | return astype->value.octet_string; |
1148 | } | 1157 | } |
1158 | LCRYPTO_ALIAS(PKCS7_digest_from_attributes) | ||
1149 | 1159 | ||
1150 | int | 1160 | int |
1151 | PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, | 1161 | PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, |
@@ -1167,6 +1177,7 @@ PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, | |||
1167 | } | 1177 | } |
1168 | return (1); | 1178 | return (1); |
1169 | } | 1179 | } |
1180 | LCRYPTO_ALIAS(PKCS7_set_signed_attributes) | ||
1170 | 1181 | ||
1171 | int | 1182 | int |
1172 | PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk) | 1183 | PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk) |
@@ -1187,6 +1198,7 @@ PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk) | |||
1187 | } | 1198 | } |
1188 | return (1); | 1199 | return (1); |
1189 | } | 1200 | } |
1201 | LCRYPTO_ALIAS(PKCS7_set_attributes) | ||
1190 | 1202 | ||
1191 | int | 1203 | int |
1192 | PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, | 1204 | PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, |
@@ -1194,12 +1206,14 @@ PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, | |||
1194 | { | 1206 | { |
1195 | return (add_attribute(&(p7si->auth_attr), nid, atrtype, value)); | 1207 | return (add_attribute(&(p7si->auth_attr), nid, atrtype, value)); |
1196 | } | 1208 | } |
1209 | LCRYPTO_ALIAS(PKCS7_add_signed_attribute) | ||
1197 | 1210 | ||
1198 | int | 1211 | int |
1199 | PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, void *value) | 1212 | PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, void *value) |
1200 | { | 1213 | { |
1201 | return (add_attribute(&(p7si->unauth_attr), nid, atrtype, value)); | 1214 | return (add_attribute(&(p7si->unauth_attr), nid, atrtype, value)); |
1202 | } | 1215 | } |
1216 | LCRYPTO_ALIAS(PKCS7_add_attribute) | ||
1203 | 1217 | ||
1204 | static int | 1218 | static int |
1205 | add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, void *value) | 1219 | add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, void *value) |