summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/ssl_algs.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-02-13 23:07:20 +0000
committerjkim <jkim@FreeBSD.org>2013-02-13 23:07:20 +0000
commit754bee57763650b50ece26c6f026c1795b4132d8 (patch)
tree265bba8e82f9a88ce59fc212bc8bf5e01c270b16 /crypto/openssl/ssl/ssl_algs.c
parenta6d6a2787087806f8a0ae6290d1df47c9471a269 (diff)
parent9069337c8384d04bea914cdfac40b533e60cade6 (diff)
downloadFreeBSD-src-754bee57763650b50ece26c6f026c1795b4132d8.zip
FreeBSD-src-754bee57763650b50ece26c6f026c1795b4132d8.tar.gz
Merge OpenSSL 1.0.1e.
Approved by: secteam (simon), benl (silence)
Diffstat (limited to 'crypto/openssl/ssl/ssl_algs.c')
-rw-r--r--crypto/openssl/ssl/ssl_algs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl_algs.c b/crypto/openssl/ssl/ssl_algs.c
index d443143..9c34d19 100644
--- a/crypto/openssl/ssl/ssl_algs.c
+++ b/crypto/openssl/ssl/ssl_algs.c
@@ -94,6 +94,7 @@ int SSL_library_init(void)
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());
OpenPOWER on IntegriCloud