feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix to resolve unit test error with WOLFSSL_CIPHER_INTERNALNAME or NO_ERROR_STRINGS defined.

Browse Source
This commit is contained in:
David Garske
2019-01-13 11:06:04 -08:00
parent 56415928ff
commit 809fed8f05
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/api.c
View File

@@ -2008,22 +2008,20 @@ static void test_client_nofail(void* args, void *cb)
} }
/* test the various get cipher methods */ /* test the various get cipher methods */
/* Internal cipher suite names */
cipherSuite = wolfSSL_get_current_cipher_suite(ssl); cipherSuite = wolfSSL_get_current_cipher_suite(ssl);
cipherName1 = wolfSSL_get_cipher_name(ssl); cipherName1 = wolfSSL_get_cipher_name(ssl);
cipherName2 = wolfSSL_get_cipher_name_from_suite( cipherName2 = wolfSSL_get_cipher_name_from_suite(
(cipherSuite >> 8), cipherSuite & 0xFF); (cipherSuite >> 8), cipherSuite & 0xFF);
AssertStrEQ(cipherName1, cipherName2); AssertStrEQ(cipherName1, cipherName2);
/* IANA Cipher Suites Names */
/* Unless WOLFSSL_CIPHER_INTERNALNAME or NO_ERROR_STRINGS,
then its the internal cipher suite name */
cipher = wolfSSL_get_current_cipher(ssl); cipher = wolfSSL_get_current_cipher(ssl);
cipherName1 = wolfSSL_CIPHER_get_name(cipher); cipherName1 = wolfSSL_CIPHER_get_name(cipher);
cipherName2 = wolfSSL_get_cipher(ssl); cipherName2 = wolfSSL_get_cipher(ssl);
#ifdef NO_ERROR_STRINGS
AssertNull(cipherName1);
AssertNull(cipherName2);
#else
AssertStrEQ(cipherName1, cipherName2); AssertStrEQ(cipherName1, cipherName2);
#endif
if (cb != NULL) if (cb != NULL)
((cbType)cb)(ctx, ssl); ((cbType)cb)(ctx, ssl);