diff options
author | tb <> | 2023-12-15 14:21:14 +0000 |
---|---|---|
committer | tb <> | 2023-12-15 14:21:14 +0000 |
commit | 4c32a0f8c45fb3530cce31c2272342d45fe38cea (patch) | |
tree | 09ac3c71e34f659d7a6852e4e17f5f6ff1390465 /src | |
parent | 705e4d237c379c27211ff8d0c50e8ee5a58011e4 (diff) | |
download | openbsd-4c32a0f8c45fb3530cce31c2272342d45fe38cea.tar.gz openbsd-4c32a0f8c45fb3530cce31c2272342d45fe38cea.tar.bz2 openbsd-4c32a0f8c45fb3530cce31c2272342d45fe38cea.zip |
Move all the neutered PBE API to the bottom of the file
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/evp/evp_pbe.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index b5f83bf1f4..edcd385341 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.30 2023/12/15 14:16:44 tb Exp $ */ | 1 | /* $OpenBSD: evp_pbe.c,v 1.31 2023/12/15 14:21:14 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 | */ |
@@ -198,22 +198,6 @@ OBJ_bsearch_pbe2(EVP_PBE_CTL *key, EVP_PBE_CTL const *base, int num) | |||
198 | } | 198 | } |
199 | 199 | ||
200 | int | 200 | int |
201 | EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid, | ||
202 | EVP_PBE_KEYGEN *keygen) | ||
203 | { | ||
204 | EVPerror(ERR_R_DISABLED); | ||
205 | return 0; | ||
206 | } | ||
207 | |||
208 | int | ||
209 | EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md, | ||
210 | EVP_PBE_KEYGEN *keygen) | ||
211 | { | ||
212 | EVPerror(ERR_R_DISABLED); | ||
213 | return 0; | ||
214 | } | ||
215 | |||
216 | int | ||
217 | EVP_PBE_find(int type, int pbe_nid, | 201 | EVP_PBE_find(int type, int pbe_nid, |
218 | int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen) | 202 | int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen) |
219 | { | 203 | { |
@@ -238,6 +222,22 @@ EVP_PBE_find(int type, int pbe_nid, | |||
238 | return 1; | 222 | return 1; |
239 | } | 223 | } |
240 | 224 | ||
225 | int | ||
226 | EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid, | ||
227 | EVP_PBE_KEYGEN *keygen) | ||
228 | { | ||
229 | EVPerror(ERR_R_DISABLED); | ||
230 | return 0; | ||
231 | } | ||
232 | |||
233 | int | ||
234 | EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md, | ||
235 | EVP_PBE_KEYGEN *keygen) | ||
236 | { | ||
237 | EVPerror(ERR_R_DISABLED); | ||
238 | return 0; | ||
239 | } | ||
240 | |||
241 | void | 241 | void |
242 | EVP_PBE_cleanup(void) | 242 | EVP_PBE_cleanup(void) |
243 | { | 243 | { |