diff options
| author | tb <> | 2024-03-02 10:06:48 +0000 |
|---|---|---|
| committer | tb <> | 2024-03-02 10:06:48 +0000 |
| commit | bf1a25cf15e3f47d3834fd61008d8a969ffb84cb (patch) | |
| tree | c814eaf2f463aff9a457b94e954ff362d66c264b /src/lib/libcrypto/evp/evp.h | |
| parent | dd0f795db17e3461ba7c60f8116c3ead2cc485b9 (diff) | |
| download | openbsd-bf1a25cf15e3f47d3834fd61008d8a969ffb84cb.tar.gz openbsd-bf1a25cf15e3f47d3834fd61008d8a969ffb84cb.tar.bz2 openbsd-bf1a25cf15e3f47d3834fd61008d8a969ffb84cb.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.h')
| -rw-r--r-- | src/lib/libcrypto/evp/evp.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index eba3ab3869..b810e72767 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp.h,v 1.127 2024/03/02 10:04:40 tb Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.128 2024/03/02 10:06:48 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -897,26 +897,6 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | |||
| 897 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, | 897 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, |
| 898 | int en_de); | 898 | int en_de); |
| 899 | 899 | ||
| 900 | void PKCS5_PBE_add(void); | ||
| 901 | |||
| 902 | int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, | ||
| 903 | ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de); | ||
| 904 | |||
| 905 | /* PBE type */ | ||
| 906 | |||
| 907 | /* Can appear as the outermost AlgorithmIdentifier */ | ||
| 908 | #define EVP_PBE_TYPE_OUTER 0x0 | ||
| 909 | /* Is an PRF type OID */ | ||
| 910 | #define EVP_PBE_TYPE_PRF 0x1 | ||
| 911 | |||
| 912 | int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid, | ||
| 913 | EVP_PBE_KEYGEN *keygen); | ||
| 914 | int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md, | ||
| 915 | EVP_PBE_KEYGEN *keygen); | ||
| 916 | int EVP_PBE_find(int type, int pbe_nid, int *pcnid, int *pmnid, | ||
| 917 | EVP_PBE_KEYGEN **pkeygen); | ||
| 918 | void EVP_PBE_cleanup(void); | ||
| 919 | |||
| 920 | #define ASN1_PKEY_ALIAS 0x1 | 900 | #define ASN1_PKEY_ALIAS 0x1 |
| 921 | #define ASN1_PKEY_DYNAMIC 0x2 | 901 | #define ASN1_PKEY_DYNAMIC 0x2 |
| 922 | #define ASN1_PKEY_SIGPARAM_NULL 0x4 | 902 | #define ASN1_PKEY_SIGPARAM_NULL 0x4 |
