diff --git a/trunk/configure b/trunk/configure
index 264b37ad2..1f0c96d72 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -128,7 +128,7 @@ END
 LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a"
 # openssl-1.1.0e, for the RTMP complex handshake.
 LibSSLRoot="";LibSSLfile=""
-if [ $SRS_SSL = YES && $SRS_USE_SYS_SSL = NO ]; then
+if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL == NO ]]; then
     LibSSLRoot="${SRS_OBJS_DIR}/openssl/include"; LibSSLfile="${SRS_OBJS_DIR}/openssl/lib/libssl.a ${SRS_OBJS_DIR}/openssl/lib/libcrypto.a";
 fi
 # gperftools-2.1, for mem check and mem/cpu profile
@@ -141,7 +141,7 @@ if [ $SRS_GPERF_MD = YES ]; then
 fi
 # the link options, always use static link
 SrsLinkOptions="-ldl";
-if [ $SRS_SSL = YES && $SRS_USE_SYS_SSL = YES ]; then
+if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL == YES ]]; then
     SrsLinkOptions="${SrsLinkOptions} -lssl -lcrypto";
 fi
 # if static specified, add static
diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp
index 81e42e0ad..c361f79b4 100644
--- a/trunk/src/app/srs_app_hls.cpp
+++ b/trunk/src/app/srs_app_hls.cpp
@@ -647,10 +647,6 @@ srs_error_t SrsHlsMuxer::write_hls_key()
 {
     srs_error_t err = srs_success;
     
-    if (hls_keys) {
-        srs_warn("SSL is disabled, ignore HLS key");
-    }
-    
     if (hls_keys && current->sequence_no % hls_fragments_per_key == 0) {
         if (RAND_bytes(key, 16) < 0) {
             return srs_error_wrap(err, "rand key failed.");
diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp
index 04aae7266..3e73f2988 100644
--- a/trunk/src/protocol/srs_rtmp_handshake.cpp
+++ b/trunk/src/protocol/srs_rtmp_handshake.cpp
@@ -106,6 +106,8 @@ static int DH_set_length(DH *dh, long length)
     return 1;
 }
 
+#endif
+
 namespace _srs_internal
 {
     // 68bytes FMS key which is used to sign the sever packet.
@@ -1080,8 +1082,6 @@ namespace _srs_internal
     }
 }
 
-#endif
-
 SrsSimpleHandshake::SrsSimpleHandshake()
 {
 }
diff --git a/trunk/src/protocol/srs_rtmp_handshake.hpp b/trunk/src/protocol/srs_rtmp_handshake.hpp
index 109616eee..f43787c30 100644
--- a/trunk/src/protocol/srs_rtmp_handshake.hpp
+++ b/trunk/src/protocol/srs_rtmp_handshake.hpp
@@ -37,7 +37,7 @@ class SrsBuffer;
 namespace _srs_internal
 {
     // the digest key generate size.
-#define SRS_OpensslHashSize 512
+    #define SRS_OpensslHashSize 512
     extern uint8_t SrsGenuineFMSKey[];
     extern uint8_t SrsGenuineFPKey[];
     srs_error_t openssl_HMACsha256(const void* key, int key_size, const void* data, int data_size, void* digest);