diff options
author | tb <> | 2024-01-27 16:26:25 +0000 |
---|---|---|
committer | tb <> | 2024-01-27 16:26:25 +0000 |
commit | c1e6a7d223506c596700ea3d5161a3f66fd40a9b (patch) | |
tree | 52d8d417954eb2146e67e42c77ee881f78d0643b /src | |
parent | 6c31f1174ed0b29a95e7976b3dcb9efb3432a81f (diff) | |
download | openbsd-c1e6a7d223506c596700ea3d5161a3f66fd40a9b.tar.gz openbsd-c1e6a7d223506c596700ea3d5161a3f66fd40a9b.tar.bz2 openbsd-c1e6a7d223506c596700ea3d5161a3f66fd40a9b.zip |
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 'src')
-rw-r--r-- | src/lib/libcrypto/evp/evp_pbe.c | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/p5_crpt.c | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index 422fb356ba..7f7784847b 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.37 2024/01/27 16:22:29 tb Exp $ */ | 1 | /* $OpenBSD: evp_pbe.c,v 1.38 2024/01/27 16:26:25 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 | */ |
@@ -365,3 +365,8 @@ void | |||
365 | EVP_PBE_cleanup(void) | 365 | EVP_PBE_cleanup(void) |
366 | { | 366 | { |
367 | } | 367 | } |
368 | |||
369 | void | ||
370 | PKCS5_PBE_add(void) | ||
371 | { | ||
372 | } | ||
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c index d26439ad26..15b9935ac1 100644 --- a/src/lib/libcrypto/evp/p5_crpt.c +++ b/src/lib/libcrypto/evp/p5_crpt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p5_crpt.c,v 1.23 2023/07/07 19:37:54 beck Exp $ */ | 1 | /* $OpenBSD: p5_crpt.c,v 1.24 2024/01/27 16:26:25 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 | */ |
@@ -66,14 +66,6 @@ | |||
66 | 66 | ||
67 | #include "evp_local.h" | 67 | #include "evp_local.h" |
68 | 68 | ||
69 | /* Doesn't do anything now: Builtin PBE algorithms in static table. | ||
70 | */ | ||
71 | |||
72 | void | ||
73 | PKCS5_PBE_add(void) | ||
74 | { | ||
75 | } | ||
76 | |||
77 | int | 69 | int |
78 | PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, | 70 | PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, |
79 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de) | 71 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de) |