wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-08 11:30:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix define check of NO_CERT to be NO_CERTS.

Browse Source
This commit is contained in:
David Garske
2019-01-11 21:10:07 -08:00
parent bcc177b23d
commit 45cd80b4b7
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cyassl/ctaocrypt/settings.h
+1 -1
View File
@@ -184,7 +184,7 @@
#ifdef MBED
#define CYASSL_USER_IO
#define NO_FILESYSTEM
#define NO_CERT
#define NO_CERTS
#define USE_CERT_BUFFERS_1024
#define NO_WRITEV
#define NO_DEV_RANDOM
src/ssl.c
+2 -2
View File
@@ -30909,7 +30909,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
{ OCSP_NONCE_OID, OCSP_NONCE_OID, oidOcspType, "OCSP_nonce" },
#endif /* HAVE_OCSP */
#ifndef NO_CERT
#ifndef NO_CERTS
/* oidCertExtType */
{ BASIC_CA_OID, BASIC_CA_OID, oidCertExtType, "X509 basic ca" },
{ ALT_NAMES_OID, ALT_NAMES_OID, oidCertExtType, "X509 alt names" },
@@ -35781,7 +35781,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_AutoPrivateKey(WOLFSSL_EVP_PKEY** pkey,
}
#endif
#if defined(OPENSSL_ALL) && !defined(NO_CERT) && defined(WOLFSSL_CERT_GEN) && \
#if defined(OPENSSL_ALL) && !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
defined(WOLFSSL_CERT_REQ)
int wolfSSL_i2d_X509_REQ(WOLFSSL_X509* req, unsigned char** out)
{
src/tls.c
+2 -2
View File
@@ -9453,7 +9453,7 @@ int TLSX_WriteRequest(WOLFSSL* ssl, byte* output, byte msgType, word16* pOffset)
#endif
}
#ifdef WOLFSSL_TLS13
#ifndef NO_CERT
#ifndef NO_CERTS
else if (msgType == certificate_request) {
XMEMSET(semaphore, 0xff, SEMAPHORE_SIZE);
TURN_OFF(semaphore, TLSX_ToSemaphore(TLSX_SIGNATURE_ALGORITHMS));
@@ -9579,7 +9579,7 @@ int TLSX_GetResponseSize(WOLFSSL* ssl, byte msgType, word16* pLength)
#endif
#ifdef WOLFSSL_TLS13
#ifndef NO_CERT
#ifndef NO_CERTS
case certificate:
XMEMSET(semaphore, 0xff, SEMAPHORE_SIZE);
TURN_OFF(semaphore, TLSX_ToSemaphore(TLSX_STATUS_REQUEST));
tests/api.c
+3 -3
View File
@@ -21613,7 +21613,7 @@ static void test_EVP_PKEY_ec(void)
#endif
}
#if defined(OPENSSL_ALL) && !defined(NO_CERT)
#if defined(OPENSSL_ALL) && !defined(NO_CERTS)
static void free_x509(X509* x)
{
AssertIntEQ((x == (X509*)1 || x == (X509*)2), 1);
@@ -21622,7 +21622,7 @@ static void free_x509(X509* x)
static void test_sk_X509(void)
{
#if defined(OPENSSL_ALL) && !defined(NO_CERT)
#if defined(OPENSSL_ALL) && !defined(NO_CERTS)
STACK_OF(X509)* s;
AssertNotNull(s = sk_X509_new());
@@ -21661,7 +21661,7 @@ static void test_X509_get_signature_nid(void)
static void test_X509_REQ(void)
{
#if defined(OPENSSL_ALL) && !defined(NO_CERT) && defined(WOLFSSL_CERT_GEN) && \
#if defined(OPENSSL_ALL) && !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
defined(WOLFSSL_CERT_REQ)
X509_NAME* name;
#if !defined(NO_RSA) || defined(HAVE_ECC)
wolfssl/wolfcrypt/settings.h
+1 -1
View File
@@ -325,7 +325,7 @@
#ifdef MBED
#define WOLFSSL_USER_IO
#define NO_FILESYSTEM
#define NO_CERT
#define NO_CERTS
#if !defined(USE_CERT_BUFFERS_2048) && !defined(USE_CERT_BUFFERS_4096)
#define USE_CERT_BUFFERS_1024
#endif