From 1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 13 Apr 2014 15:25:35 +0000
Subject: Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build
 machinery.

---
 src/lib/libssl/ssl_algs.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lib/libssl/ssl_algs.c')

diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c
index d443143c59..9c34d19725 100644
--- a/src/lib/libssl/ssl_algs.c
+++ b/src/lib/libssl/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());
-- 
cgit v1.2.3-55-g6feb