From c03c10e1d4a422aeab5845380350ecf656e3af36 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Thu, 14 Jun 2018 14:38:15 -0600
Subject: [PATCH] move location of wolfSSL_d2i_RSA_PublicKey to fix x509 small
 build

---
 src/ssl.c   | 8 ++++----
 tests/api.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index ca005eb19..c9e3ab137 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -27649,10 +27649,6 @@ int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x)
 
 #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 *rsa = NULL;
@@ -27708,6 +27704,10 @@ int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, const unsigned char **pp)
 }
 #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 */
 int wolfSSL_RSA_LoadDer(WOLFSSL_RSA* rsa, const unsigned char* derBuf, int derSz)
 {
diff --git a/tests/api.c b/tests/api.c
index dbb8ef2b1..8d4d6e123 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -3039,7 +3039,7 @@ static void test_wolfSSL_URI(void)
 {
 #if !defined(NO_CERTS) && !defined(NO_RSA) && !defined(NO_FILESYSTEM) \
     && (defined(KEEP_PEER_CERT) || defined(SESSION_CERTS) || \
-    defined(OPENSSL_EXTRA)  || defined(OPENSSL_EXTRA_X509_SMALL))
+    defined(OPENSSL_EXTRA))
     WOLFSSL_X509* x509;
     const char uri[] = "./certs/client-uri-cert.pem";
     const char badUri[] = "./certs/client-relative-uri.pem";