diff options
| author | tb <> | 2024-03-02 10:15:16 +0000 |
|---|---|---|
| committer | tb <> | 2024-03-02 10:15:16 +0000 |
| commit | 3660b6a445c7a10167a56fab6d7e882cdf782d91 (patch) | |
| tree | b64f2e46e44a68cbc68c3942179d7a04de1089b4 /src/lib/libcrypto/pkcs12/p12_decr.c | |
| parent | feacafd961cf1e2403e9dcb6c3f6a0722730e87d (diff) | |
| download | openbsd-3660b6a445c7a10167a56fab6d7e882cdf782d91.tar.gz openbsd-3660b6a445c7a10167a56fab6d7e882cdf782d91.tar.bz2 openbsd-3660b6a445c7a10167a56fab6d7e882cdf782d91.zip | |
Remove a lot of PKCS12 garbage from the public API
PKCS12 is a hot mess. Please participate in the survey at the end of
https://www.cs.auckland.ac.nz/~pgut001/pubs/pfx.html to increase its
credibility and unanimity.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_decr.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_decr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c index 04818acd13..907d4e52a6 100644 --- a/src/lib/libcrypto/pkcs12/p12_decr.c +++ b/src/lib/libcrypto/pkcs12/p12_decr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_decr.c,v 1.25 2024/02/18 15:44:10 tb Exp $ */ | 1 | /* $OpenBSD: p12_decr.c,v 1.26 2024/03/02 10:15:16 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -116,7 +116,6 @@ err: | |||
| 116 | return out; | 116 | return out; |
| 117 | 117 | ||
| 118 | } | 118 | } |
| 119 | LCRYPTO_ALIAS(PKCS12_pbe_crypt); | ||
| 120 | 119 | ||
| 121 | /* Decrypt an OCTET STRING and decode ASN1 structure | 120 | /* Decrypt an OCTET STRING and decode ASN1 structure |
| 122 | * if zbuf set zero buffer after use. | 121 | * if zbuf set zero buffer after use. |
| @@ -145,7 +144,6 @@ PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it, | |||
| 145 | free(out); | 144 | free(out); |
| 146 | return ret; | 145 | return ret; |
| 147 | } | 146 | } |
| 148 | LCRYPTO_ALIAS(PKCS12_item_decrypt_d2i); | ||
| 149 | 147 | ||
| 150 | /* Encode ASN1 structure and encrypt, return OCTET STRING | 148 | /* Encode ASN1 structure and encrypt, return OCTET STRING |
| 151 | * if zbuf set zero encoding. | 149 | * if zbuf set zero encoding. |
| @@ -184,6 +182,3 @@ err: | |||
| 184 | ASN1_OCTET_STRING_free(oct); | 182 | ASN1_OCTET_STRING_free(oct); |
| 185 | return NULL; | 183 | return NULL; |
| 186 | } | 184 | } |
| 187 | LCRYPTO_ALIAS(PKCS12_item_i2d_encrypt); | ||
| 188 | |||
| 189 | IMPLEMENT_PKCS12_STACK_OF(PKCS7) | ||
