diff options
| author | tb <> | 2023-02-16 08:38:17 +0000 |
|---|---|---|
| committer | tb <> | 2023-02-16 08:38:17 +0000 |
| commit | 24a27fd0d17d515b00097199de60fa85a76a95df (patch) | |
| tree | 689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/pkcs7/pk7_doit.c | |
| parent | 3170d87c6599656e7568dca509714cf70723f0d2 (diff) | |
| download | openbsd-24a27fd0d17d515b00097199de60fa85a76a95df.tar.gz openbsd-24a27fd0d17d515b00097199de60fa85a76a95df.tar.bz2 openbsd-24a27fd0d17d515b00097199de60fa85a76a95df.zip | |
libressl *_namespace.h: adjust *_ALIAS() to require a semicolon
LCRYPTO_ALIAS() and LSSL_ALIAS() contained a trailing semicolon.
This does not conform to style(9), breaks editors and ctags and
(most importantly) my workflow. Fix this by neutering them with
asm("") so that -Wpedantic doesn't complain. There's precedent
in libc's namespace.h
fix suggested by & ok jsing
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_doit.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 30 |
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 | } |
| 407 | LCRYPTO_ALIAS(PKCS7_dataInit) | 407 | LCRYPTO_ALIAS(PKCS7_dataInit); |
| 408 | 408 | ||
| 409 | static int | 409 | static int |
| 410 | pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert) | 410 | pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert) |
| @@ -630,7 +630,7 @@ err: | |||
| 630 | } | 630 | } |
| 631 | return (out); | 631 | return (out); |
| 632 | } | 632 | } |
| 633 | LCRYPTO_ALIAS(PKCS7_dataDecode) | 633 | LCRYPTO_ALIAS(PKCS7_dataDecode); |
| 634 | 634 | ||
| 635 | static BIO * | 635 | static BIO * |
| 636 | PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid) | 636 | PKCS7_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 | } |
| 862 | LCRYPTO_ALIAS(PKCS7_dataFinal) | 862 | LCRYPTO_ALIAS(PKCS7_dataFinal); |
| 863 | 863 | ||
| 864 | int | 864 | int |
| 865 | PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) | 865 | PKCS7_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 | } |
| 921 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_sign) | 921 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_sign); |
| 922 | 922 | ||
| 923 | int | 923 | int |
| 924 | 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, |
| @@ -980,7 +980,7 @@ err: | |||
| 980 | 980 | ||
| 981 | return ret; | 981 | return ret; |
| 982 | } | 982 | } |
| 983 | LCRYPTO_ALIAS(PKCS7_dataVerify) | 983 | LCRYPTO_ALIAS(PKCS7_dataVerify); |
| 984 | 984 | ||
| 985 | int | 985 | int |
| 986 | 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) |
| @@ -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 | } |
| 1090 | LCRYPTO_ALIAS(PKCS7_signatureVerify) | 1090 | LCRYPTO_ALIAS(PKCS7_signatureVerify); |
| 1091 | 1091 | ||
| 1092 | PKCS7_ISSUER_AND_SERIAL * | 1092 | PKCS7_ISSUER_AND_SERIAL * |
| 1093 | PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx) | 1093 | PKCS7_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 | } |
| 1113 | LCRYPTO_ALIAS(PKCS7_get_issuer_and_serial) | 1113 | LCRYPTO_ALIAS(PKCS7_get_issuer_and_serial); |
| 1114 | 1114 | ||
| 1115 | ASN1_TYPE * | 1115 | ASN1_TYPE * |
| 1116 | PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid) | 1116 | PKCS7_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 | } |
| 1120 | LCRYPTO_ALIAS(PKCS7_get_signed_attribute) | 1120 | LCRYPTO_ALIAS(PKCS7_get_signed_attribute); |
| 1121 | 1121 | ||
| 1122 | ASN1_TYPE * | 1122 | ASN1_TYPE * |
| 1123 | PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) | 1123 | PKCS7_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 | } |
| 1127 | LCRYPTO_ALIAS(PKCS7_get_attribute) | 1127 | LCRYPTO_ALIAS(PKCS7_get_attribute); |
| 1128 | 1128 | ||
| 1129 | static ASN1_TYPE * | 1129 | static ASN1_TYPE * |
| 1130 | get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid) | 1130 | get_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 | } |
| 1158 | LCRYPTO_ALIAS(PKCS7_digest_from_attributes) | 1158 | LCRYPTO_ALIAS(PKCS7_digest_from_attributes); |
| 1159 | 1159 | ||
| 1160 | int | 1160 | int |
| 1161 | PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, | 1161 | PKCS7_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 | } |
| 1180 | LCRYPTO_ALIAS(PKCS7_set_signed_attributes) | 1180 | LCRYPTO_ALIAS(PKCS7_set_signed_attributes); |
| 1181 | 1181 | ||
| 1182 | int | 1182 | int |
| 1183 | 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) |
| @@ -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 | } |
| 1201 | LCRYPTO_ALIAS(PKCS7_set_attributes) | 1201 | LCRYPTO_ALIAS(PKCS7_set_attributes); |
| 1202 | 1202 | ||
| 1203 | int | 1203 | int |
| 1204 | 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, |
| @@ -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 | } |
| 1209 | LCRYPTO_ALIAS(PKCS7_add_signed_attribute) | 1209 | LCRYPTO_ALIAS(PKCS7_add_signed_attribute); |
| 1210 | 1210 | ||
| 1211 | int | 1211 | int |
| 1212 | 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) |
| 1213 | { | 1213 | { |
| 1214 | return (add_attribute(&(p7si->unauth_attr), nid, atrtype, value)); | 1214 | return (add_attribute(&(p7si->unauth_attr), nid, atrtype, value)); |
| 1215 | } | 1215 | } |
| 1216 | LCRYPTO_ALIAS(PKCS7_add_attribute) | 1216 | LCRYPTO_ALIAS(PKCS7_add_attribute); |
| 1217 | 1217 | ||
| 1218 | static int | 1218 | static int |
| 1219 | 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) |
