diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2023-12-15 14:21:15 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2023-12-15 14:21:15 +0000 |
| commit | 79ce5de5560e53f4939d64e67af94c955f015ed3 (patch) | |
| tree | 8764130b37eddae98aaa1a53883bd5e6c83703fe | |
| parent | 22cfc8c854f117bd22f76a70805ffc0e7c0465ad (diff) | |
Move all the neutered PBE API to the bottom of the file
| -rw-r--r-- | lib/libcrypto/evp/evp_pbe.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/libcrypto/evp/evp_pbe.c b/lib/libcrypto/evp/evp_pbe.c index b5f83bf1f40..edcd3853419 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.30 2023/12/15 14:16:44 tb Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.31 2023/12/15 14:21:14 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -198,22 +198,6 @@ OBJ_bsearch_pbe2(EVP_PBE_CTL *key, EVP_PBE_CTL const *base, int num) } int -EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid, - EVP_PBE_KEYGEN *keygen) -{ - EVPerror(ERR_R_DISABLED); - return 0; -} - -int -EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md, - EVP_PBE_KEYGEN *keygen) -{ - EVPerror(ERR_R_DISABLED); - return 0; -} - -int EVP_PBE_find(int type, int pbe_nid, int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen) { @@ -238,6 +222,22 @@ EVP_PBE_find(int type, int pbe_nid, return 1; } +int +EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid, + EVP_PBE_KEYGEN *keygen) +{ + EVPerror(ERR_R_DISABLED); + return 0; +} + +int +EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md, + EVP_PBE_KEYGEN *keygen) +{ + EVPerror(ERR_R_DISABLED); + return 0; +} + void EVP_PBE_cleanup(void) { |