Merge pull request #866 from JacobBarthelmeh/Testing

add back in haveTrustPeer variable and put macro guard on WC_RNG typedef

src/internal.c

@@ -6763,6 +6763,10 @@ static int DoCertificate(WOLFSSL* ssl, byte* input, word32* inOutIdx,
     DoCertArgs  args[1];
 #endif
 
+#ifdef WOLFSSL_TRUST_PEER_CERT
+    byte haveTrustPeer = 0; /* was cert verified by loaded trusted peer cert */
+#endif
+
     WOLFSSL_ENTER("DoCertificate");
 
 #ifdef WOLFSSL_ASYNC_CRYPT

wolfssl/wolfcrypt/asn_public.h

@@ -33,7 +33,10 @@
 /* Opaque keys. Only key pointers are used for arguments */
 typedef struct ecc_key ecc_key;
 typedef struct RsaKey RsaKey;
-typedef struct WC_RNG WC_RNG;
+#ifndef WC_RNG_TYPE_DEFINED /* guard on redeclaration */
+    typedef struct WC_RNG WC_RNG;
+    #define WC_RNG_TYPE_DEFINED
+#endif
 
 /* Certificate file Type */
 enum CertType {