diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2024-01-27 16:26:26 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-01-27 16:26:26 +0000 |
| commit | 36d21e4807b9f121815c13f179e069b3bfc63d2e (patch) | |
| tree | f408f15b3d49e87731cfb38cfa6a15556fffa3d5 /lib | |
| parent | b33dc61e68ecb98dcfa99e29a719d73d3c76806d (diff) | |
Throw PKCS5_PBE_add() into the trash bin at the end of evp_pbe.c
This has been a noop since forever and will be removed in the next bump.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/evp/evp_pbe.c | 7 | ||||
| -rw-r--r-- | lib/libcrypto/evp/p5_crpt.c | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/lib/libcrypto/evp/evp_pbe.c b/lib/libcrypto/evp/evp_pbe.c index 422fb356bad..7f7784847b5 100644 --- a/lib/libcrypto/evp/evp_pbe.c +++ b/lib/libcrypto/evp/evp_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pbe.c,v 1.37 2024/01/27 16:22:29 tb Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.38 2024/01/27 16:26:25 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -365,3 +365,8 @@ void EVP_PBE_cleanup(void) { } + +void +PKCS5_PBE_add(void) +{ +} diff --git a/lib/libcrypto/evp/p5_crpt.c b/lib/libcrypto/evp/p5_crpt.c index d26439ad260..15b9935ac17 100644 --- a/lib/libcrypto/evp/p5_crpt.c +++ b/lib/libcrypto/evp/p5_crpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_crpt.c,v 1.23 2023/07/07 19:37:54 beck Exp $ */ +/* $OpenBSD: p5_crpt.c,v 1.24 2024/01/27 16:26:25 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -66,14 +66,6 @@ #include "evp_local.h" -/* Doesn't do anything now: Builtin PBE algorithms in static table. - */ - -void -PKCS5_PBE_add(void) -{ -} - int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de) |