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

Fixes for jenkins test failures

Browse Source
This commit is contained in:
Carie Pointer
2019-12-09 14:04:52 -07:00
parent ee13dfd878
commit 9ad970d8a4
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/internal.c
View File

@@ -17993,7 +17993,8 @@ const char* GetCipherEncStr(char n[][MAX_SEGMENT_SZ]) {
(XSTRNCMP(n2,"CHACHA20",8) == 0 && XSTRNCMP(n3,"POLY1305",8) == 0)) (XSTRNCMP(n2,"CHACHA20",8) == 0 && XSTRNCMP(n3,"POLY1305",8) == 0))
encStr = "CHACHA20/POLY1305(256)"; encStr = "CHACHA20/POLY1305(256)";
else if ((XSTRNCMP(n0,"NULL",4) == 0) || (XSTRNCMP(n1,"NULL",4) == 0) || else if ((XSTRNCMP(n0,"NULL",4) == 0) || (XSTRNCMP(n1,"NULL",4) == 0) ||
(XSTRNCMP(n2,"NULL",4) == 0)) (XSTRNCMP(n2,"NULL",4) == 0) ||
((XSTRNCMP(n0,"TLS13",5) == 0) && (XSTRNCMP(n3,"",0) == 0)))
encStr = "None"; encStr = "None";
else if ((XSTRNCMP(n0,"IDEA",4) == 0)) else if ((XSTRNCMP(n0,"IDEA",4) == 0))
encStr = "IDEA"; encStr = "IDEA";
@@ -18081,7 +18082,7 @@ int wolfSSL_sk_CIPHER_description(WOLFSSL_CIPHER* cipher)
const char *keaStr, *authStr, *encStr, *macStr, *protocol; const char *keaStr, *authStr, *encStr, *macStr, *protocol;
char n[MAX_SEGMENTS][MAX_SEGMENT_SZ] = {{0}}; char n[MAX_SEGMENTS][MAX_SEGMENT_SZ] = {{0}};
uint8_t len = UINT8_SZ-1; uint8_t len = UINT8_SZ-1;
WOLFSSL_ENTER("wolfSSL_CIPHER_sk_description"); WOLFSSL_ENTER("wolfSSL_sk_CIPHER_description");
if (cipher == NULL) if (cipher == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;

4
src/ssl.c
View File

@@ -19210,7 +19210,9 @@ void wolfSSL_ACCESS_DESCRIPTION_free(WOLFSSL_ACCESS_DESCRIPTION* access)
WOLFSSL_STACK* wolfSSL_sk_new_node(void* heap) WOLFSSL_STACK* wolfSSL_sk_new_node(void* heap)
{ {
WOLFSSL_ENTER("wolfSSL_sk_new_node"); WOLFSSL_ENTER("wolfSSL_sk_new_node");
WOLFSSL_STACK* sk = (WOLFSSL_STACK*)XMALLOC(sizeof(WOLFSSL_STACK), heap, WOLFSSL_STACK* sk;
sk = (WOLFSSL_STACK*)XMALLOC(sizeof(WOLFSSL_STACK), heap,
DYNAMIC_TYPE_OPENSSL); DYNAMIC_TYPE_OPENSSL);
if (sk != NULL) { if (sk != NULL) {
XMEMSET(sk, 0, sizeof(*sk)); XMEMSET(sk, 0, sizeof(*sk));

2
tests/api.c
View File

@@ -20585,7 +20585,7 @@ static void test_wolfSSL_X509_STORE_CTX(void)
#endif #endif
AssertNotNull(ctx = X509_STORE_CTX_new()); AssertNotNull(ctx = X509_STORE_CTX_new());
X509_STORE_CTX_set_verify_cb(ctx, (void *)verify_cb); X509_STORE_CTX_set_verify_cb(ctx, verify_cb);
X509_STORE_CTX_free(ctx); X509_STORE_CTX_free(ctx);
#ifdef OPENSSL_ALL #ifdef OPENSSL_ALL