From 4511557f012b57659eeabfe5101719bd7c37af1e Mon Sep 17 00:00:00 2001 From: Carie Pointer Date: Mon, 9 Dec 2019 15:57:53 -0700 Subject: [PATCH] More jenkins test fixes --- src/ssl.c | 2 +- tests/api.c | 2 +- wolfssl/openssl/dh.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 02c930f63..11bae7a9a 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -19209,8 +19209,8 @@ void wolfSSL_ACCESS_DESCRIPTION_free(WOLFSSL_ACCESS_DESCRIPTION* access) * returns a new WOLFSSL_STACK structure on success */ WOLFSSL_STACK* wolfSSL_sk_new_node(void* heap) { - WOLFSSL_ENTER("wolfSSL_sk_new_node"); WOLFSSL_STACK* sk; + WOLFSSL_ENTER("wolfSSL_sk_new_node"); sk = (WOLFSSL_STACK*)XMALLOC(sizeof(WOLFSSL_STACK), heap, DYNAMIC_TYPE_OPENSSL); diff --git a/tests/api.c b/tests/api.c index 717f24f19..00ce0af7b 100644 --- a/tests/api.c +++ b/tests/api.c @@ -29215,7 +29215,7 @@ static void test_wolfSSL_X509_print() AssertNotNull(bio = BIO_new(BIO_s_mem())); AssertIntEQ(X509_print(bio, x509), SSL_SUCCESS); -#if defined(WOLFSSL_QT) || defined(OPENSSL_ALL) +#if defined(WOLFSSL_QT) AssertIntEQ(BIO_get_mem_data(bio, NULL), 3113); #else AssertIntEQ(BIO_get_mem_data(bio, NULL), 3103); diff --git a/wolfssl/openssl/dh.h b/wolfssl/openssl/dh.h index 23bc2ab43..e34f1e66e 100644 --- a/wolfssl/openssl/dh.h +++ b/wolfssl/openssl/dh.h @@ -69,8 +69,6 @@ WOLFSSL_API int wolfSSL_DH_LoadDer(WOLFSSL_DH*, const unsigned char*, int sz); WOLFSSL_API int wolfSSL_DH_set0_pqg(WOLFSSL_DH*, WOLFSSL_BIGNUM*, WOLFSSL_BIGNUM*, WOLFSSL_BIGNUM*); -typedef WOLFSSL_DH DH; - #define DH_new wolfSSL_DH_new #define DH_free wolfSSL_DH_free