Merge pull request #2209 from tmael/maintenanceDefects

Increased ciphers buffer size for testsuite and ECC API for getting curve from dp
This commit is contained in:
toddouska
2019-07-15 16:49:13 -07:00
committed by GitHub
7 changed files with 122 additions and 23 deletions

View File

@ -1236,7 +1236,7 @@ static void Usage(void)
static void ShowCiphers(void)
{
char ciphers[4096];
char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE];
int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers));
@ -1374,12 +1374,11 @@ int bench_tls(void* args)
}
else {
/* Run for each cipher */
const int ciphersSz = 4096;
ciphers = (char*)XMALLOC(ciphersSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
ciphers = (char*)XMALLOC(WOLFSSL_CIPHER_LIST_MAX_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (ciphers == NULL) {
goto exit;
}
wolfSSL_get_ciphers(ciphers, ciphersSz);
wolfSSL_get_ciphers(ciphers, WOLFSSL_CIPHER_LIST_MAX_SIZE);
cipher = ciphers;
}

View File

@ -195,7 +195,7 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl)
static void ShowCiphers(void)
{
static char ciphers[4096];
static char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE];
int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers));