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

GNUTLS: Avoid null derefence in constructing ciphersuite

Browse source
This commit is contained in:
Aaron Jones 2016-08-17 16:58:40 +00:00
parent 897c10749d
commit 06feeb244d
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libratbox/src/gnutls.c
View file

@ -673,11 +673,27 @@ rb_ssl_get_cipher(rb_fde_t *F)
{
static char buf[1024];
rb_snprintf(buf, sizeof(buf), "%s-%s-%s-%s",
gnutls_protocol_get_name(gnutls_protocol_get_version(SSL_P(F))),
gnutls_kx_get_name(gnutls_kx_get(SSL_P(F))),
gnutls_cipher_get_name(gnutls_cipher_get(SSL_P(F))),
gnutls_mac_get_name(gnutls_mac_get(SSL_P(F))));
const char* proto_name =
gnutls_protocol_get_name(gnutls_protocol_get_version(SSL_P(F)));
const char* kex_alg_name =
gnutls_kx_get_name(gnutls_kx_get(SSL_P(F)));
const char* cipher_alg_name =
gnutls_cipher_get_name(gnutls_cipher_get(SSL_P(F)));
const char* mac_alg_name =
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 : "",
mac_alg_name ? "-" : "");
return buf;
}