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

MbedTLS: Cleaner iteration of ciphersuite list

Browse source
This commit is contained in:
Aaron Jones 2016-09-01 18:18:09 +00:00
parent ede25e0a8a
commit 6df12e8169
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libratbox/src/mbedtls.c
View file

@ -456,11 +456,12 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
{ {
size_t suites_count = 0; size_t suites_count = 0;
char *cipher_str = cipherlist_dup; char *cipher_str = cipherlist_dup;
char *cipher_idx;
while(*cipher_str != '\0' && suites_count < RB_MAX_CIPHERSUITES) do
{ {
// Arbitrary, but the same separator as OpenSSL uses // Arbitrary, but the same separator as OpenSSL uses
char *const cipher_idx = strchr(cipher_str, ':'); cipher_idx = strchr(cipher_str, ':');
// This could legitimately be NULL (last ciphersuite in the list) // This could legitimately be NULL (last ciphersuite in the list)
if(cipher_idx != NULL) if(cipher_idx != NULL)
@ -482,9 +483,11 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
if(cipher_idn != 0) if(cipher_idn != 0)
newcfg->suites[suites_count++] = cipher_idn; newcfg->suites[suites_count++] = cipher_idn;
// Advance the string to the next entry -- this could end the loop // Advance the string to the next entry
cipher_str += (cipher_len + 1); if (cipher_idx)
} cipher_str = cipher_idx + 1;
} while(cipher_idx && suites_count < RB_MAX_CIPHERSUITES);
if(suites_count > 0) if(suites_count > 0)
{ {