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_lib.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_lib.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_lib.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c index efb6343f54..6eda698c94 100644 --- a/src/lib/libcrypto/pkcs7/pk7_lib.c +++ b/src/lib/libcrypto/pkcs7/pk7_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pk7_lib.c,v 1.25 2022/11/26 16:08:54 tb Exp $ */ | 1 | /* $OpenBSD: pk7_lib.c,v 1.26 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 | * |
| @@ -109,7 +109,7 @@ PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg) | |||
| 109 | } | 109 | } |
| 110 | return (ret); | 110 | return (ret); |
| 111 | } | 111 | } |
| 112 | LCRYPTO_ALIAS(PKCS7_ctrl) | 112 | LCRYPTO_ALIAS(PKCS7_ctrl); |
| 113 | 113 | ||
| 114 | int | 114 | int |
| 115 | PKCS7_content_new(PKCS7 *p7, int type) | 115 | PKCS7_content_new(PKCS7 *p7, int type) |
| @@ -129,7 +129,7 @@ err: | |||
| 129 | PKCS7_free(ret); | 129 | PKCS7_free(ret); |
| 130 | return (0); | 130 | return (0); |
| 131 | } | 131 | } |
| 132 | LCRYPTO_ALIAS(PKCS7_content_new) | 132 | LCRYPTO_ALIAS(PKCS7_content_new); |
| 133 | 133 | ||
| 134 | int | 134 | int |
| 135 | PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data) | 135 | PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data) |
| @@ -160,7 +160,7 @@ PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data) | |||
| 160 | err: | 160 | err: |
| 161 | return (0); | 161 | return (0); |
| 162 | } | 162 | } |
| 163 | LCRYPTO_ALIAS(PKCS7_set_content) | 163 | LCRYPTO_ALIAS(PKCS7_set_content); |
| 164 | 164 | ||
| 165 | int | 165 | int |
| 166 | PKCS7_set_type(PKCS7 *p7, int type) | 166 | PKCS7_set_type(PKCS7 *p7, int type) |
| @@ -230,7 +230,7 @@ PKCS7_set_type(PKCS7 *p7, int type) | |||
| 230 | err: | 230 | err: |
| 231 | return (0); | 231 | return (0); |
| 232 | } | 232 | } |
| 233 | LCRYPTO_ALIAS(PKCS7_set_type) | 233 | LCRYPTO_ALIAS(PKCS7_set_type); |
| 234 | 234 | ||
| 235 | int | 235 | int |
| 236 | PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other) | 236 | PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other) |
| @@ -239,7 +239,7 @@ PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other) | |||
| 239 | p7->d.other = other; | 239 | p7->d.other = other; |
| 240 | return 1; | 240 | return 1; |
| 241 | } | 241 | } |
| 242 | LCRYPTO_ALIAS(PKCS7_set0_type_other) | 242 | LCRYPTO_ALIAS(PKCS7_set0_type_other); |
| 243 | 243 | ||
| 244 | int | 244 | int |
| 245 | PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi) | 245 | PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi) |
| @@ -295,7 +295,7 @@ PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi) | |||
| 295 | return 0; | 295 | return 0; |
| 296 | return (1); | 296 | return (1); |
| 297 | } | 297 | } |
| 298 | LCRYPTO_ALIAS(PKCS7_add_signer) | 298 | LCRYPTO_ALIAS(PKCS7_add_signer); |
| 299 | 299 | ||
| 300 | int | 300 | int |
| 301 | PKCS7_add_certificate(PKCS7 *p7, X509 *x509) | 301 | PKCS7_add_certificate(PKCS7 *p7, X509 *x509) |
| @@ -329,7 +329,7 @@ PKCS7_add_certificate(PKCS7 *p7, X509 *x509) | |||
| 329 | } | 329 | } |
| 330 | return (1); | 330 | return (1); |
| 331 | } | 331 | } |
| 332 | LCRYPTO_ALIAS(PKCS7_add_certificate) | 332 | LCRYPTO_ALIAS(PKCS7_add_certificate); |
| 333 | 333 | ||
| 334 | int | 334 | int |
| 335 | PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl) | 335 | PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl) |
| @@ -364,7 +364,7 @@ PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl) | |||
| 364 | } | 364 | } |
| 365 | return (1); | 365 | return (1); |
| 366 | } | 366 | } |
| 367 | LCRYPTO_ALIAS(PKCS7_add_crl) | 367 | LCRYPTO_ALIAS(PKCS7_add_crl); |
| 368 | 368 | ||
| 369 | int | 369 | int |
| 370 | PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey, | 370 | PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey, |
| @@ -409,7 +409,7 @@ PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey, | |||
| 409 | err: | 409 | err: |
| 410 | return 0; | 410 | return 0; |
| 411 | } | 411 | } |
| 412 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_set) | 412 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_set); |
| 413 | 413 | ||
| 414 | PKCS7_SIGNER_INFO * | 414 | PKCS7_SIGNER_INFO * |
| 415 | PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey, const EVP_MD *dgst) | 415 | PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey, const EVP_MD *dgst) |
| @@ -439,7 +439,7 @@ err: | |||
| 439 | PKCS7_SIGNER_INFO_free(si); | 439 | PKCS7_SIGNER_INFO_free(si); |
| 440 | return (NULL); | 440 | return (NULL); |
| 441 | } | 441 | } |
| 442 | LCRYPTO_ALIAS(PKCS7_add_signature) | 442 | LCRYPTO_ALIAS(PKCS7_add_signature); |
| 443 | 443 | ||
| 444 | int | 444 | int |
| 445 | PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md) | 445 | PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md) |
| @@ -457,7 +457,7 @@ PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md) | |||
| 457 | PKCS7error(PKCS7_R_WRONG_CONTENT_TYPE); | 457 | PKCS7error(PKCS7_R_WRONG_CONTENT_TYPE); |
| 458 | return 1; | 458 | return 1; |
| 459 | } | 459 | } |
| 460 | LCRYPTO_ALIAS(PKCS7_set_digest) | 460 | LCRYPTO_ALIAS(PKCS7_set_digest); |
| 461 | 461 | ||
| 462 | STACK_OF(PKCS7_SIGNER_INFO) * | 462 | STACK_OF(PKCS7_SIGNER_INFO) * |
| 463 | PKCS7_get_signer_info(PKCS7 *p7) | 463 | PKCS7_get_signer_info(PKCS7 *p7) |
| @@ -471,7 +471,7 @@ PKCS7_get_signer_info(PKCS7 *p7) | |||
| 471 | } else | 471 | } else |
| 472 | return (NULL); | 472 | return (NULL); |
| 473 | } | 473 | } |
| 474 | LCRYPTO_ALIAS(PKCS7_get_signer_info) | 474 | LCRYPTO_ALIAS(PKCS7_get_signer_info); |
| 475 | 475 | ||
| 476 | void | 476 | void |
| 477 | PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk, | 477 | PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk, |
| @@ -484,7 +484,7 @@ PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk, | |||
| 484 | if (psig) | 484 | if (psig) |
| 485 | *psig = si->digest_enc_alg; | 485 | *psig = si->digest_enc_alg; |
| 486 | } | 486 | } |
| 487 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_get0_algs) | 487 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_get0_algs); |
| 488 | 488 | ||
| 489 | void | 489 | void |
| 490 | PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc) | 490 | PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc) |
| @@ -492,7 +492,7 @@ PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc) | |||
| 492 | if (penc) | 492 | if (penc) |
| 493 | *penc = ri->key_enc_algor; | 493 | *penc = ri->key_enc_algor; |
| 494 | } | 494 | } |
| 495 | LCRYPTO_ALIAS(PKCS7_RECIP_INFO_get0_alg) | 495 | LCRYPTO_ALIAS(PKCS7_RECIP_INFO_get0_alg); |
| 496 | 496 | ||
| 497 | PKCS7_RECIP_INFO * | 497 | PKCS7_RECIP_INFO * |
| 498 | PKCS7_add_recipient(PKCS7 *p7, X509 *x509) | 498 | PKCS7_add_recipient(PKCS7 *p7, X509 *x509) |
| @@ -511,7 +511,7 @@ err: | |||
| 511 | PKCS7_RECIP_INFO_free(ri); | 511 | PKCS7_RECIP_INFO_free(ri); |
| 512 | return NULL; | 512 | return NULL; |
| 513 | } | 513 | } |
| 514 | LCRYPTO_ALIAS(PKCS7_add_recipient) | 514 | LCRYPTO_ALIAS(PKCS7_add_recipient); |
| 515 | 515 | ||
| 516 | int | 516 | int |
| 517 | PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri) | 517 | PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri) |
| @@ -536,7 +536,7 @@ PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri) | |||
| 536 | return 0; | 536 | return 0; |
| 537 | return (1); | 537 | return (1); |
| 538 | } | 538 | } |
| 539 | LCRYPTO_ALIAS(PKCS7_add_recipient_info) | 539 | LCRYPTO_ALIAS(PKCS7_add_recipient_info); |
| 540 | 540 | ||
| 541 | int | 541 | int |
| 542 | PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) | 542 | PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) |
| @@ -583,7 +583,7 @@ err: | |||
| 583 | EVP_PKEY_free(pkey); | 583 | EVP_PKEY_free(pkey); |
| 584 | return 0; | 584 | return 0; |
| 585 | } | 585 | } |
| 586 | LCRYPTO_ALIAS(PKCS7_RECIP_INFO_set) | 586 | LCRYPTO_ALIAS(PKCS7_RECIP_INFO_set); |
| 587 | 587 | ||
| 588 | X509 * | 588 | X509 * |
| 589 | PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si) | 589 | PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si) |
| @@ -595,7 +595,7 @@ PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si) | |||
| 595 | else | 595 | else |
| 596 | return (NULL); | 596 | return (NULL); |
| 597 | } | 597 | } |
| 598 | LCRYPTO_ALIAS(PKCS7_cert_from_signer_info) | 598 | LCRYPTO_ALIAS(PKCS7_cert_from_signer_info); |
| 599 | 599 | ||
| 600 | int | 600 | int |
| 601 | PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher) | 601 | PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher) |
| @@ -626,7 +626,7 @@ PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher) | |||
| 626 | ec->cipher = cipher; | 626 | ec->cipher = cipher; |
| 627 | return 1; | 627 | return 1; |
| 628 | } | 628 | } |
| 629 | LCRYPTO_ALIAS(PKCS7_set_cipher) | 629 | LCRYPTO_ALIAS(PKCS7_set_cipher); |
| 630 | 630 | ||
| 631 | int | 631 | int |
| 632 | PKCS7_stream(unsigned char ***boundary, PKCS7 *p7) | 632 | PKCS7_stream(unsigned char ***boundary, PKCS7 *p7) |
| @@ -671,4 +671,4 @@ PKCS7_stream(unsigned char ***boundary, PKCS7 *p7) | |||
| 671 | 671 | ||
| 672 | return 1; | 672 | return 1; |
| 673 | } | 673 | } |
| 674 | LCRYPTO_ALIAS(PKCS7_stream) | 674 | LCRYPTO_ALIAS(PKCS7_stream); |
