summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/evp.h
diff options
context:
space:
mode:
authortb <>2024-03-02 10:20:27 +0000
committertb <>2024-03-02 10:20:27 +0000
commit207b3a197be2d83ff1333f7fa2dccd6d5271b120 (patch)
treefbf01f5453b712e42063e482a28304a6a55892cd /src/lib/libcrypto/evp/evp.h
parent4083f4c7fda85159558b8c05200130506dc51c45 (diff)
downloadopenbsd-207b3a197be2d83ff1333f7fa2dccd6d5271b120.tar.gz
openbsd-207b3a197be2d83ff1333f7fa2dccd6d5271b120.tar.bz2
openbsd-207b3a197be2d83ff1333f7fa2dccd6d5271b120.zip
Remove more PBE stuff from the public API
This is still needed internally for CMS and its predecessors. This removal will enable disentangling some of its innards. ok jsing
Diffstat (limited to 'src/lib/libcrypto/evp/evp.h')
-rw-r--r--src/lib/libcrypto/evp/evp.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 28b095ffd4..9e203b086d 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.130 2024/03/02 10:13:13 tb Exp $ */ 1/* $OpenBSD: evp.h,v 1.131 2024/03/02 10:20:27 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 *
@@ -870,17 +870,12 @@ int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
870int EVP_CIPHER_type(const EVP_CIPHER *ctx); 870int EVP_CIPHER_type(const EVP_CIPHER *ctx);
871 871
872/* PKCS5 password based encryption */ 872/* PKCS5 password based encryption */
873int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
874 ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de);
875int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, 873int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
876 const unsigned char *salt, int saltlen, int iter, int keylen, 874 const unsigned char *salt, int saltlen, int iter, int keylen,
877 unsigned char *out); 875 unsigned char *out);
878int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt, 876int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt,
879 int saltlen, int iter, const EVP_MD *digest, int keylen, 877 int saltlen, int iter, const EVP_MD *digest, int keylen,
880 unsigned char *out); 878 unsigned char *out);
881int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
882 ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md,
883 int en_de);
884 879
885#define ASN1_PKEY_ALIAS 0x1 880#define ASN1_PKEY_ALIAS 0x1
886#define ASN1_PKEY_DYNAMIC 0x2 881#define ASN1_PKEY_DYNAMIC 0x2