diff options
| author | tb <> | 2024-03-02 10:06:48 +0000 |
|---|---|---|
| committer | tb <> | 2024-03-02 10:06:48 +0000 |
| commit | 705576b96a445d220b98a9940401456c7bf52a10 (patch) | |
| tree | c814eaf2f463aff9a457b94e954ff362d66c264b /src/lib/libcrypto/evp/evp_pbe.c | |
| parent | f133870188c9e5cfe00cc09b92ee4f957e5448ac (diff) | |
| download | openbsd-705576b96a445d220b98a9940401456c7bf52a10.tar.gz openbsd-705576b96a445d220b98a9940401456c7bf52a10.tar.bz2 openbsd-705576b96a445d220b98a9940401456c7bf52a10.zip | |
Remove EVP_PBE_* API from public visibility
You can no longer add your custom PBE algorithm. Pity. EVP_PBE_CipherInit()
stays for internal use, the rest goes away copmletely.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/evp/evp_pbe.c')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_pbe.c | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index eb8d5c4157..e33f2cb08f 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.42 2024/02/18 15:45:42 tb Exp $ */ | 1 | /* $OpenBSD: evp_pbe.c,v 1.43 2024/03/02 10:06:48 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 | */ |
| @@ -640,41 +640,3 @@ PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | |||
| 640 | return ret; | 640 | return ret; |
| 641 | } | 641 | } |
| 642 | LCRYPTO_ALIAS(PKCS12_PBE_keyivgen); | 642 | LCRYPTO_ALIAS(PKCS12_PBE_keyivgen); |
| 643 | |||
| 644 | /* | ||
| 645 | * XXX - remove the functions below in the next major bump | ||
| 646 | */ | ||
| 647 | |||
| 648 | int | ||
| 649 | EVP_PBE_find(int type, int pbe_nid, int *out_cipher_nid, int *out_md_nid, | ||
| 650 | EVP_PBE_KEYGEN **out_keygen) | ||
| 651 | { | ||
| 652 | EVPerror(ERR_R_DISABLED); | ||
| 653 | return 0; | ||
| 654 | } | ||
| 655 | |||
| 656 | int | ||
| 657 | EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid, | ||
| 658 | EVP_PBE_KEYGEN *keygen) | ||
| 659 | { | ||
| 660 | EVPerror(ERR_R_DISABLED); | ||
| 661 | return 0; | ||
| 662 | } | ||
| 663 | |||
| 664 | int | ||
| 665 | EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md, | ||
| 666 | EVP_PBE_KEYGEN *keygen) | ||
| 667 | { | ||
| 668 | EVPerror(ERR_R_DISABLED); | ||
| 669 | return 0; | ||
| 670 | } | ||
| 671 | |||
| 672 | void | ||
| 673 | EVP_PBE_cleanup(void) | ||
| 674 | { | ||
| 675 | } | ||
| 676 | |||
| 677 | void | ||
| 678 | PKCS5_PBE_add(void) | ||
| 679 | { | ||
| 680 | } | ||
