albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

conn-ssl.c: don't append a newline to ConnSSL_GetCipherInfo

This commit is contained in:
Florian Westphal 2008-09-15 12:25:54 +02:00
parent ef3327d372
commit 2fce881d96
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ngircd/conn-ssl.c
View File

@ -670,12 +670,20 @@ bool
ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len) ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
{ {
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
char *nl;
SSL *ssl; SSL *ssl;
assert(c != NULL); assert(c != NULL);
assert(len >= 128); assert(len >= 128);
ssl = c->ssl_state.ssl; ssl = c->ssl_state.ssl;
if (!ssl) return false; if (!ssl)
return SSL_CIPHER_description(SSL_get_current_cipher(ssl), buf, len) != NULL; 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 #endif
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
assert(c != NULL); assert(c != NULL);
@ -692,7 +700,7 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
name_proto = gnutls_protocol_get_name(gnutls_protocol_get_version(sess)); name_proto = gnutls_protocol_get_name(gnutls_protocol_get_version(sess));
name_keyexchange = gnutls_kx_get_name(gnutls_kx_get(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; name_cipher, name_mac, name_proto, name_keyexchange, name_cipher, keysize, name_mac) > 0;
} }
return false; return false;