9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GNUTLS: Improve rb_ssl_get_cipher()

Browse source 
* Add debugging assertions.

* Reduce the buffer size in line with the other backends.

* Ask for the cipher name directly instead of constructing it ourselves
  from the key exchange / authentication algorithm, symmetric encryption
  algorithm, and message authentication code algorithm.
This commit is contained in:
Aaron Jones 2016-09-16 22:09:49 +00:00
parent dd59642de1
commit 9c7dda22e8
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libratbox/src/gnutls.c
View file

@ -799,30 +799,20 @@ rb_get_ssl_info(char *buf, size_t len)
} }
const char * const char *
rb_ssl_get_cipher(rb_fde_t *F) rb_ssl_get_cipher(rb_fde_t *const F)
{ {
static char buf[1024]; if(F == NULL || F->ssl == NULL)
return NULL;
const char* proto_name = static char buf[512];
gnutls_protocol_get_name(gnutls_protocol_get_version(SSL_P(F)));
const char* kex_alg_name = gnutls_protocol_t version_ptr = gnutls_protocol_get_version(SSL_P(F));
gnutls_kx_get_name(gnutls_kx_get(SSL_P(F))); gnutls_cipher_algorithm_t cipher_ptr = gnutls_cipher_get(SSL_P(F));
const char* cipher_alg_name = const char *const version = gnutls_protocol_get_name(version_ptr);
gnutls_cipher_get_name(gnutls_cipher_get(SSL_P(F))); const char *const cipher = gnutls_cipher_get_name(cipher_ptr);
const char* mac_alg_name = (void) rb_snprintf(buf, sizeof buf, "%s, %s", version, cipher);
gnutls_mac_get_name(gnutls_mac_get(SSL_P(F)));
(void) rb_snprintf(buf, sizeof buf, "%s%s%s%s%s%s%s",
proto_name ? proto_name : "",
proto_name ? ", " : "",
kex_alg_name ? kex_alg_name : "",
kex_alg_name ? "-" : "",
cipher_alg_name ? cipher_alg_name : "",
cipher_alg_name ? "-" : "",
mac_alg_name ? mac_alg_name : "");
return buf; return buf;
} }