diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-06-30 00:42:56 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-06-30 00:42:56 +0000 |
| commit | 5271ebd9a32c0097f61451f2a4f0bf6ab946ac85 (patch) | |
| tree | 645769692b57992ea735d65bcd0587c25f729af2 /crypto/evp/p5_crpt.c | |
| parent | 5676d8cb7679589523549ca8587277428cb0ce6b (diff) | |
| download | openssl-5271ebd9a32c0097f61451f2a4f0bf6ab946ac85.zip openssl-5271ebd9a32c0097f61451f2a4f0bf6ab946ac85.tar.gz openssl-5271ebd9a32c0097f61451f2a4f0bf6ab946ac85.tar.bz2 | |
More no-xxx option tweaks.
Diffstat (limited to 'crypto/evp/p5_crpt.c')
| -rw-r--r-- | crypto/evp/p5_crpt.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c index abf6af0..e3dae52 100644 --- a/crypto/evp/p5_crpt.c +++ b/crypto/evp/p5_crpt.c @@ -68,22 +68,36 @@ void PKCS5_PBE_add(void) { #ifndef NO_DES +# ifndef NO_MD5 EVP_PBE_alg_add(NID_pbeWithMD5AndDES_CBC, EVP_des_cbc(), EVP_md5(), PKCS5_PBE_keyivgen); +# endif +# ifndef NO_MD2 EVP_PBE_alg_add(NID_pbeWithMD2AndDES_CBC, EVP_des_cbc(), EVP_md2(), PKCS5_PBE_keyivgen); +# endif +# ifndef NO_SHA EVP_PBE_alg_add(NID_pbeWithSHA1AndDES_CBC, EVP_des_cbc(), EVP_sha1(), PKCS5_PBE_keyivgen); +# endif #endif #ifndef NO_RC2 +# ifndef NO_MD5 EVP_PBE_alg_add(NID_pbeWithMD5AndRC2_CBC, EVP_rc2_64_cbc(), EVP_md5(), PKCS5_PBE_keyivgen); +# endif +# ifndef NO_MD2 EVP_PBE_alg_add(NID_pbeWithMD2AndRC2_CBC, EVP_rc2_64_cbc(), EVP_md2(), PKCS5_PBE_keyivgen); +# endif +# ifndef NO_SHA EVP_PBE_alg_add(NID_pbeWithSHA1AndRC2_CBC, EVP_rc2_64_cbc(), EVP_sha1(), PKCS5_PBE_keyivgen); +# endif #endif +#ifndef NO_HMAC EVP_PBE_alg_add(NID_pbes2, NULL, NULL, PKCS5_v2_PBE_keyivgen); +#endif } int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, |