diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-06-04 23:33:48 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-06-04 23:33:48 +0000 |
| commit | b0c6fb8064f129ba94aa9e1f479750a20b2bdee2 (patch) | |
| tree | 1d5fe0a9348ffd6a1d79f0887a23c9ac4a0ac922 /crypto/evp | |
| parent | ef8335d900ee5af9d83237ad29d6904a3bb69290 (diff) | |
The rest of the PKCS#5, PKCS#8 patch I forgot before :-)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/Makefile.ssl | 4 | ||||
| -rw-r--r-- | crypto/evp/evp.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl index 2409c5861b..add46ed9f1 100644 --- a/crypto/evp/Makefile.ssl +++ b/crypto/evp/Makefile.ssl @@ -35,7 +35,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c \ m_ripemd.c \ p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ - c_all.c evp_lib.c bio_ok.c evp_pkey.c evp_pbe.c + c_all.c evp_lib.c bio_ok.c evp_pkey.c evp_pbe.c p5_crpt.c LIBOBJ= encode.o digest.o evp_enc.o evp_key.o \ e_ecb_d.o e_cbc_d.o e_cfb_d.o e_ofb_d.o \ @@ -50,7 +50,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o \ m_ripemd.o \ p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \ bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \ - c_all.o evp_lib.o bio_ok.o evp_pkey.o evp_pbe.o + c_all.o evp_lib.o bio_ok.o evp_pkey.o evp_pbe.o p5_crpt.o SRC= $(LIBSRC) diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 39f48610ed..9df4f1fdab 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -634,6 +634,11 @@ int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type); int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type); int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type); +/* PKCS5 password based encryption */ +int PKCS5_PBE_keyivgen(const char *pass, int passlen, unsigned char *salt, + int saltlen, int iter, EVP_CIPHER *cipher, EVP_MD *md, + unsigned char *key, unsigned char *iv); + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. |