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

Merge pull request #1624 from JacobBarthelmeh/Testing

Browse Source 
move location of wolfSSL_d2i_RSA_PublicKey to fix x509 small build
This commit is contained in:
toddouska
2018-06-15 10:39:08 -07:00
committed by GitHub
parent 139a08a98e c03c10e1d4
commit 495e3552d2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl.c
View File

@@ -27649,10 +27649,6 @@ int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x)
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */
#endif /* !NO_RSA */
#endif /* OPENSSL_EXTRA */
#if !defined(NO_RSA) && (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL))
WOLFSSL_RSA *wolfSSL_d2i_RSAPublicKey(WOLFSSL_RSA **r, const unsigned char **pp, long len) WOLFSSL_RSA *wolfSSL_d2i_RSAPublicKey(WOLFSSL_RSA **r, const unsigned char **pp, long len)
{ {
WOLFSSL_RSA *rsa = NULL; WOLFSSL_RSA *rsa = NULL;
@@ -27708,6 +27704,10 @@ int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, const unsigned char **pp)
} }
#endif /* #if !defined(HAVE_FAST_RSA) */ #endif /* #if !defined(HAVE_FAST_RSA) */
#endif /* !NO_RSA */
#endif /* OPENSSL_EXTRA */
#if !defined(NO_RSA) && (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL))
/* return WOLFSSL_SUCCESS if success, WOLFSSL_FATAL_ERROR if error */ /* return WOLFSSL_SUCCESS if success, WOLFSSL_FATAL_ERROR if error */
int wolfSSL_RSA_LoadDer(WOLFSSL_RSA* rsa, const unsigned char* derBuf, int derSz) int wolfSSL_RSA_LoadDer(WOLFSSL_RSA* rsa, const unsigned char* derBuf, int derSz)
{ {

2
tests/api.c
View File

@@ -3039,7 +3039,7 @@ static void test_wolfSSL_URI(void)
{ {
#if !defined(NO_CERTS) && !defined(NO_RSA) && !defined(NO_FILESYSTEM) \ #if !defined(NO_CERTS) && !defined(NO_RSA) && !defined(NO_FILESYSTEM) \
&& (defined(KEEP_PEER_CERT) || defined(SESSION_CERTS) || \ && (defined(KEEP_PEER_CERT) || defined(SESSION_CERTS) || \
defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)) defined(OPENSSL_EXTRA))
WOLFSSL_X509* x509; WOLFSSL_X509* x509;
const char uri[] = "./certs/client-uri-cert.pem"; const char uri[] = "./certs/client-uri-cert.pem";
const char badUri[] = "./certs/client-relative-uri.pem"; const char badUri[] = "./certs/client-relative-uri.pem";