Fix ConnSSL_LogCertInfo(): unused variable "cred" (GNUTLS)

[ngircd-alex.git] / src / ngircd / conn-ssl.c

diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c
index ae9595f99c9b75d366504dc5e25b83f18eeb634d..5a1000728a7b604753736c0be3f0f98cc02584fc 100644 (file)
--- a/src/ngircd/conn-ssl.c
+++ b/src/ngircd/conn-ssl.c
@@ -539,7 +539,6 @@ ConnSSL_LogCertInfo( CONNECTION *c )
                SSL_get_version(ssl), SSL_get_cipher(ssl), c->sock);
 #endif
 #ifdef HAVE_LIBGNUTLS
-       gnutls_credentials_type_t cred;
        gnutls_session_t sess = c->ssl_state.gnutls_session;
        gnutls_cipher_algorithm_t cipher = gnutls_cipher_get(sess);
 
@@ -670,12 +669,20 @@ bool
 ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
 {
 #ifdef HAVE_LIBSSL
+       char *nl;
+
        SSL *ssl;
        assert(c != NULL);
        assert(len >= 128);
        ssl = c->ssl_state.ssl;
-       if (!ssl) return false;
-       return SSL_CIPHER_description(SSL_get_current_cipher(ssl), buf, len) != NULL;
+       if (!ssl)
+               return false;
+       *buf = 0;
+       SSL_CIPHER_description(SSL_get_current_cipher(ssl), buf, len);
+       nl = strchr(buf, '\n');
+       if (nl)
+               *nl = 0;
+       return true;
 #endif
 #ifdef HAVE_LIBGNUTLS
        assert(c != NULL);
@@ -692,7 +699,7 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
                name_proto = gnutls_protocol_get_name(gnutls_protocol_get_version(sess));
                name_keyexchange = gnutls_kx_get_name(gnutls_kx_get(sess));
 
-               return snprintf(buf, len, "%s-%s%15s Kx=%s      Enc=%s(%u) Mac=%s\n",
+               return snprintf(buf, len, "%s-%s%15s Kx=%s      Enc=%s(%u) Mac=%s",
                        name_cipher, name_mac, name_proto, name_keyexchange, name_cipher, keysize, name_mac) > 0;
        }
        return false;