summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp
diff options
context:
space:
mode:
authortb <>2024-03-02 10:15:16 +0000
committertb <>2024-03-02 10:15:16 +0000
commit3660b6a445c7a10167a56fab6d7e882cdf782d91 (patch)
treeb64f2e46e44a68cbc68c3942179d7a04de1089b4 /src/lib/libcrypto/evp
parentfeacafd961cf1e2403e9dcb6c3f6a0722730e87d (diff)
downloadopenbsd-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/evp')
-rw-r--r--src/lib/libcrypto/evp/evp_pbe.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index e33f2cb08f..3f1f1ec9a4 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_pbe.c,v 1.43 2024/03/02 10:06:48 tb Exp $ */ 1/* $OpenBSD: evp_pbe.c,v 1.44 2024/03/02 10:15:15 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 */
@@ -69,8 +69,12 @@
69 69
70#include "evp_local.h" 70#include "evp_local.h"
71#include "hmac_local.h" 71#include "hmac_local.h"
72#include "pkcs12_local.h"
72 73
73/* Password based encryption (PBE) functions */ 74/* Password based encryption (PBE) functions */
75int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
76 ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md_type,
77 int en_de);
74 78
75static const struct pbe_config { 79static const struct pbe_config {
76 int pbe_nid; 80 int pbe_nid;