diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-08-23 20:53:34 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-08-23 20:53:34 +0000 |
| commit | 84e7485bfb22847d43e85e02b4d9e5e393fa34ec (patch) | |
| tree | d5d8b9145f781a774de8e114b8e702caf9569311 /ssl/ssl_algs.c | |
| parent | f56f72f2191ce94bd94b5000b9308c24c1ec9b3b (diff) | |
Add RC4-MD5 and AESNI-SHA1 "stitched" implementations [from HEAD].
Diffstat (limited to 'ssl/ssl_algs.c')
| -rw-r--r-- | ssl/ssl_algs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c index 0967b2dfe4..24976383e0 100644 --- a/ssl/ssl_algs.c +++ b/ssl/ssl_algs.c @@ -73,6 +73,9 @@ int SSL_library_init(void) #endif #ifndef OPENSSL_NO_RC4 EVP_add_cipher(EVP_rc4()); +#if !defined(OPENSSL_NO_MD5) && (defined(__x86_64) || defined(__x86_64__)) + EVP_add_cipher(EVP_rc4_hmac_md5()); +#endif #endif #ifndef OPENSSL_NO_RC2 EVP_add_cipher(EVP_rc2_cbc()); @@ -85,6 +88,10 @@ int SSL_library_init(void) EVP_add_cipher(EVP_aes_128_cbc()); EVP_add_cipher(EVP_aes_192_cbc()); EVP_add_cipher(EVP_aes_256_cbc()); +#if !defined(OPENSSL_NO_SHA) && !defined(OPNESSL_NO_SHA1) + EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1()); + EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1()); +#endif #endif #ifndef OPENSSL_NO_CAMELLIA EVP_add_cipher(EVP_camellia_128_cbc()); |