diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b478539..0cfa72d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,7 +87,6 @@ set(libssh_SRCS
   dh.c
   error.c
   getpass.c
-  gcrypt_missing.c
   gzip.c
   init.c
   kex.c
@@ -96,7 +95,6 @@ set(libssh_SRCS
   known_hosts.c
   legacy.c
   libcrypto.c
-  libgcrypt.c
   log.c
   match.c
   messages.c
@@ -114,6 +112,14 @@ set(libssh_SRCS
   wrapper.c
 )
 
+if (WITH_GCRYPT)
+  set(libssh_SRCS
+    ${libssh_SRCS}
+    libgcrypt.c
+    gcrypt_missing.c  
+  )
+endif (WITH_GCRYPT)
+
 if (WITH_SFTP)
   set(libssh_SRCS
     ${libssh_SRCS}
diff --git a/src/channels.c b/src/channels.c
index b9ba0514..02999037 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -667,21 +667,21 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
 	}
 
 	if (strcmp(request,"signal") == 0) {
-		ssh_string signal;
+		ssh_string signal_str;
         char *sig;
 
 		SAFE_FREE(request);
 		ssh_log(session, SSH_LOG_PACKET, "received signal");
 
-		signal = buffer_get_ssh_string(packet);
-		if (signal == NULL) {
+		signal_str = buffer_get_ssh_string(packet);
+		if (signal_str == NULL) {
 			ssh_log(session, SSH_LOG_PACKET, "Invalid MSG_CHANNEL_REQUEST");
 			leave_function();
 			return SSH_PACKET_USED;
 		}
 
-		sig = ssh_string_to_char(signal);
-		ssh_string_free(signal);
+		sig = ssh_string_to_char(signal_str);
+		ssh_string_free(signal_str);
 		if (sig == NULL) {
 			leave_function();
 			return SSH_PACKET_USED;