WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3157 from embhorn/zd10631 

Fix build issue with OPENSSL_EXTRA_X509_SMALL
pull/3164/head
JacobBarthelmeh 2020-07-23 13:18:28 -06:00 committed by GitHub
parent e198f6e73b 9b421ce497
commit 303d0dfedb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/ssl.c
View File

@ -17388,9 +17388,39 @@ WOLFSSL_X509* wolfSSL_X509_d2i(WOLFSSL_X509** x509, const byte* in, int len)
return newX509; return newX509;
} }
int wolfSSL_X509_get_isCA(WOLFSSL_X509* x509)
{
int isCA = 0;
WOLFSSL_ENTER("wolfSSL_X509_get_isCA");
if (x509 != NULL)
isCA = x509->isCa;
WOLFSSL_LEAVE("wolfSSL_X509_get_isCA", isCA);
return isCA;
}
#endif /* KEEP_PEER_CERT || SESSION_CERTS || OPENSSL_EXTRA || #endif /* KEEP_PEER_CERT || SESSION_CERTS || OPENSSL_EXTRA ||
OPENSSL_EXTRA_X509_SMALL */ OPENSSL_EXTRA_X509_SMALL */
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
/* returns the number of entries in the WOLFSSL_X509_NAME */
int wolfSSL_X509_NAME_entry_count(WOLFSSL_X509_NAME* name)
{
int count = 0;
WOLFSSL_ENTER("wolfSSL_X509_NAME_entry_count");
if (name != NULL)
count = name->entrySz;
WOLFSSL_LEAVE("wolfSSL_X509_NAME_entry_count", count);
return count;
}
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
#if defined(OPENSSL_ALL) || defined(KEEP_OUR_CERT) || defined(KEEP_PEER_CERT) || \ #if defined(OPENSSL_ALL) || defined(KEEP_OUR_CERT) || defined(KEEP_PEER_CERT) || \
@ -17416,20 +17446,6 @@ WOLFSSL_X509* wolfSSL_X509_d2i(WOLFSSL_X509** x509, const byte* in, int len)
return ret; return ret;
} }
int wolfSSL_X509_get_isCA(WOLFSSL_X509* x509)
{
int isCA = 0;
WOLFSSL_ENTER("wolfSSL_X509_get_isCA");
if (x509 != NULL)
isCA = x509->isCa;
WOLFSSL_LEAVE("wolfSSL_X509_get_isCA", isCA);
return isCA;
}
int wolfSSL_X509_get_signature(WOLFSSL_X509* x509, int wolfSSL_X509_get_signature(WOLFSSL_X509* x509,
unsigned char* buf, int* bufSz) unsigned char* buf, int* bufSz)
{ {
@ -20264,21 +20280,6 @@ int wolfSSL_X509_cmp(const WOLFSSL_X509 *a, const WOLFSSL_X509 *b)
return id; return id;
} }
/* returns the number of entries in the WOLFSSL_X509_NAME */
int wolfSSL_X509_NAME_entry_count(WOLFSSL_X509_NAME* name)
{
int count = 0;
WOLFSSL_ENTER("wolfSSL_X509_NAME_entry_count");
if (name != NULL)
count = name->entrySz;
WOLFSSL_LEAVE("wolfSSL_X509_NAME_entry_count", count);
return count;
}
#endif /* !NO_CERTS && OPENSSL_EXTRA */ #endif /* !NO_CERTS && OPENSSL_EXTRA */
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || \ #if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || \
@ -36748,9 +36749,16 @@ static int CopyX509NameToCertName(WOLFSSL_X509_NAME* n, CertName* cName)
int hashType; int hashType;
int sigType = WOLFSSL_FAILURE; int sigType = WOLFSSL_FAILURE;
#if !defined(NO_PWDBASED)
/* Convert key type and hash algorithm to a signature algorithm */ /* Convert key type and hash algorithm to a signature algorithm */
if (wolfSSL_EVP_get_hashinfo(md, &hashType, NULL) == WOLFSSL_FAILURE) if (wolfSSL_EVP_get_hashinfo(md, &hashType, NULL) == WOLFSSL_FAILURE) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
}
#else
(void)md;
WOLFSSL_MSG("Cannot get hashinfo when NO_PWDBASED is defined");
return WOLFSSL_FAILURE;
#endif /* !defined(NO_PWDBASED) */
if (pkey->type == EVP_PKEY_RSA) { if (pkey->type == EVP_PKEY_RSA) {