diff options
| author | tb <> | 2024-07-15 18:50:42 +0000 |
|---|---|---|
| committer | tb <> | 2024-07-15 18:50:42 +0000 |
| commit | a8cf1911030cc5d79ba22f35a904b557d5039348 (patch) | |
| tree | 5c512d7b94a63be67640da652999b91ee0ba6fce /src | |
| parent | 53175e6c86545b45b6cf609b53a853b1177a9dec (diff) | |
| download | openbsd-a8cf1911030cc5d79ba22f35a904b557d5039348.tar.gz openbsd-a8cf1911030cc5d79ba22f35a904b557d5039348.tar.bz2 openbsd-a8cf1911030cc5d79ba22f35a904b557d5039348.zip | |
Switch the EVP_PKEY_*attr* API to LCRYPTO_UNUSED()
This would have prevented the PKCS12 oopsie.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/x509.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/hidden/openssl/x509.h b/src/lib/libcrypto/hidden/openssl/x509.h index d80a3b2576..29abbc5c0e 100644 --- a/src/lib/libcrypto/hidden/openssl/x509.h +++ b/src/lib/libcrypto/hidden/openssl/x509.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509.h,v 1.7 2024/07/08 17:01:54 beck Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.8 2024/07/15 18:50:42 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -442,15 +442,15 @@ LCRYPTO_USED(X509_ocspid_print); | |||
| 442 | LCRYPTO_USED(X509_CRL_print); | 442 | LCRYPTO_USED(X509_CRL_print); |
| 443 | LCRYPTO_USED(X509_REQ_print_ex); | 443 | LCRYPTO_USED(X509_REQ_print_ex); |
| 444 | LCRYPTO_USED(X509_REQ_print); | 444 | LCRYPTO_USED(X509_REQ_print); |
| 445 | LCRYPTO_USED(EVP_PKEY_get_attr_count); | 445 | LCRYPTO_UNUSED(EVP_PKEY_get_attr_count); |
| 446 | LCRYPTO_USED(EVP_PKEY_get_attr_by_NID); | 446 | LCRYPTO_UNUSED(EVP_PKEY_get_attr_by_NID); |
| 447 | LCRYPTO_USED(EVP_PKEY_get_attr_by_OBJ); | 447 | LCRYPTO_UNUSED(EVP_PKEY_get_attr_by_OBJ); |
| 448 | LCRYPTO_USED(EVP_PKEY_get_attr); | 448 | LCRYPTO_UNUSED(EVP_PKEY_get_attr); |
| 449 | LCRYPTO_USED(EVP_PKEY_delete_attr); | 449 | LCRYPTO_UNUSED(EVP_PKEY_delete_attr); |
| 450 | LCRYPTO_USED(EVP_PKEY_add1_attr); | 450 | LCRYPTO_UNUSED(EVP_PKEY_add1_attr); |
| 451 | LCRYPTO_USED(EVP_PKEY_add1_attr_by_OBJ); | 451 | LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_OBJ); |
| 452 | LCRYPTO_USED(EVP_PKEY_add1_attr_by_NID); | 452 | LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_NID); |
| 453 | LCRYPTO_USED(EVP_PKEY_add1_attr_by_txt); | 453 | LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_txt); |
| 454 | LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_new); | 454 | LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_new); |
| 455 | LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_free); | 455 | LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_free); |
| 456 | LCRYPTO_USED(d2i_PKCS8_PRIV_KEY_INFO); | 456 | LCRYPTO_USED(d2i_PKCS8_PRIV_KEY_INFO); |