From 71863c462e0a90db5f32915880206d8b28af3753 Mon Sep 17 00:00:00 2001
From: Takashi Kojo <kojo@wolfsssl.com>
Date: Sat, 15 Sep 2018 09:29:43 +0900
Subject: [PATCH] (void) for unused in NO_RSA case

---
 src/ssl.c           |  8 --------
 wolfcrypt/src/asn.c | 10 +++++-----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index 746a04543..b40b8349c 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -5891,10 +5891,6 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname,
     if (file == XBADFILE) return WOLFSSL_BAD_FILE;
     if(XFSEEK(file, 0, XSEEK_END) != 0)
         return WOLFSSL_BAD_FILE;
-<<<<<<< HEAD
-=======
-
->>>>>>> merge PR #1820 Porting aid
     sz = XFTELL(file);
     XREWIND(file);
 
@@ -15284,10 +15280,6 @@ WOLFSSL_X509* wolfSSL_X509_load_certificate_file(const char* fname, int format)
         XFCLOSE(file);
         return NULL;
     }
-<<<<<<< HEAD
-
-=======
->>>>>>> merge PR #1820 Porting aid
     sz = XFTELL(file);
     XREWIND(file);
 
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index dd609b599..3ccc707e3 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -104,10 +104,6 @@ ASN Options:
     #include <wolfssl/wolfcrypt/rsa.h>
 #endif
 
-#if defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA_X509_SMALL)
-    #include <wolfssl/openssl/ssl.h> /* for OBJ_sn2nid */
-#endif
-
 #ifdef WOLFSSL_DEBUG_ENCODING
     #if defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
         #if MQX_USE_IO_OLD
@@ -2692,9 +2688,9 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,
         return BAD_FUNC_ARG;
     }
 
+    (void)tmpIdx;
     (void)curveOID;
     (void)oidSz;
-    (void)tmpIdx;
     (void)keySz;
     (void)heap;
 
@@ -2937,6 +2933,8 @@ int UnTraditionalEnc(byte* key, word32 keySz, byte* out, word32* outSz,
     (void)rng;
 
     return totalSz + sz;
+    
+    (void)rng;
 }
 
 
@@ -3287,6 +3285,8 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
     (void)rng;
 
     return totalSz;
+
+    (void)rng;
 }