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

Fixes for NO_BIO related to ZD11886. Replaces PR #3888.

Browse Source
This commit is contained in:
David Garske
2021-05-10 09:19:08 -07:00
parent c88afdef87
commit ead656c4db
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl.c
View File

@@ -24286,7 +24286,6 @@ int wolfSSL_X509_cmp(const WOLFSSL_X509 *a, const WOLFSSL_X509 *b)
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */
#endif /* XSNPRINTF */ #endif /* XSNPRINTF */
#endif /* !NO_BIO */
int wolfSSL_X509_signature_print(WOLFSSL_BIO *bp, int wolfSSL_X509_signature_print(WOLFSSL_BIO *bp,
const WOLFSSL_X509_ALGOR *sigalg, const WOLFSSL_ASN1_STRING *sig) const WOLFSSL_X509_ALGOR *sigalg, const WOLFSSL_ASN1_STRING *sig)
@@ -24312,6 +24311,7 @@ int wolfSSL_X509_cmp(const WOLFSSL_X509 *a, const WOLFSSL_X509 *b)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* !NO_BIO */
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
void wolfSSL_X509_get0_signature(const WOLFSSL_ASN1_BIT_STRING **psig, void wolfSSL_X509_get0_signature(const WOLFSSL_ASN1_BIT_STRING **psig,
@@ -25385,7 +25385,6 @@ cleanup:
return ret; return ret;
} }
#endif /* !NO_BIO */
/* Converts the X509 to DER format and outputs it into bio. /* Converts the X509 to DER format and outputs it into bio.
* *
@@ -25405,6 +25404,7 @@ int wolfSSL_i2d_X509_REQ_bio(WOLFSSL_BIO* bio, WOLFSSL_X509* x509)
return loadX509orX509REQFromBio(bio, x509, 1); return loadX509orX509REQFromBio(bio, x509, 1);
} }
#endif /* WOLFSSL_CERT_REQ */ #endif /* WOLFSSL_CERT_REQ */
#endif /* !NO_BIO */
#endif /* WOLFSSL_CERT_GEN */ #endif /* WOLFSSL_CERT_GEN */
/* Converts an internal structure to a DER buffer /* Converts an internal structure to a DER buffer
@@ -25510,7 +25510,6 @@ static WOLFSSL_X509* d2i_X509orX509REQ_bio(WOLFSSL_BIO* bio,
XFREE(mem, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(mem, NULL, DYNAMIC_TYPE_OPENSSL);
return localX509; return localX509;
} }
#endif /* !NO_BIO */
WOLFSSL_X509* wolfSSL_d2i_X509_bio(WOLFSSL_BIO* bio, WOLFSSL_X509** x509) WOLFSSL_X509* wolfSSL_d2i_X509_bio(WOLFSSL_BIO* bio, WOLFSSL_X509** x509)
{ {
@@ -25523,6 +25522,7 @@ WOLFSSL_X509* wolfSSL_d2i_X509_REQ_bio(WOLFSSL_BIO* bio, WOLFSSL_X509** x509)
return d2i_X509orX509REQ_bio(bio, x509, 1); return d2i_X509orX509REQ_bio(bio, x509, 1);
} }
#endif #endif
#endif /* !NO_BIO */
#if !defined(NO_ASN) && !defined(NO_PWDBASED) #if !defined(NO_ASN) && !defined(NO_PWDBASED)
#if !defined(NO_BIO) && defined(HAVE_PKCS12) #if !defined(NO_BIO) && defined(HAVE_PKCS12)