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

Jenkins fixes

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2020-08-10 12:49:18 +02:00
parent c28b7b59c3
commit ef4b29ebc7
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@@ -19231,8 +19231,8 @@ WOLFSSL_X509* wolfSSL_get_certificate(WOLFSSL* ssl)
#endif /* NO_CERTS */ #endif /* NO_CERTS */
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) #if !defined(NO_ASN) && (defined(OPENSSL_EXTRA) || \
#ifndef NO_ASN defined(OPENSSL_EXTRA_X509_SMALL))
void wolfSSL_ASN1_OBJECT_free(WOLFSSL_ASN1_OBJECT* obj) void wolfSSL_ASN1_OBJECT_free(WOLFSSL_ASN1_OBJECT* obj)
{ {
if (obj == NULL) { if (obj == NULL) {
@@ -19254,12 +19254,7 @@ void wolfSSL_ASN1_OBJECT_free(WOLFSSL_ASN1_OBJECT* obj)
XFREE(obj, NULL, DYNAMIC_TYPE_ASN1); XFREE(obj, NULL, DYNAMIC_TYPE_ASN1);
} }
} }
#endif /* NO_ASN */
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
#ifndef NO_ASN
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || \
defined(OPENSSL_EXTRA_X509_SMALL)
WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_new(void) WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_new(void)
{ {
WOLFSSL_ASN1_OBJECT* obj; WOLFSSL_ASN1_OBJECT* obj;
@@ -19278,7 +19273,6 @@ WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_new(void)
obj->dynamic |= WOLFSSL_ASN1_DYNAMIC; obj->dynamic |= WOLFSSL_ASN1_DYNAMIC;
return obj; return obj;
} }
#endif
WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_dup(WOLFSSL_ASN1_OBJECT* obj) WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_dup(WOLFSSL_ASN1_OBJECT* obj)
{ {
@@ -19314,7 +19308,9 @@ WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_dup(WOLFSSL_ASN1_OBJECT* obj)
} }
return dup; return dup;
} }
#endif /* !NO_ASN && (OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL) */
#ifndef NO_ASN
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) #if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
/* Creates and returns a new WOLFSSL_CIPHER stack. */ /* Creates and returns a new WOLFSSL_CIPHER stack. */
WOLFSSL_STACK* wolfSSL_sk_new_asn1_obj(void) WOLFSSL_STACK* wolfSSL_sk_new_asn1_obj(void)