From ac7bd0aae8cfac1479549667ba80017a90b948f4 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Mon, 28 Feb 2022 12:09:50 -0700
Subject: [PATCH] Fix up random.h conflicts with cert 3389 releases and some
 NETOS issues

---
 wolfcrypt/test/test.c          | 2 +-
 wolfssl/test.h                 | 2 +-
 wolfssl/wolfcrypt/asn_public.h | 9 +--------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 78a6f71c8..a8c43facc 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -156,7 +156,7 @@
     #define NO_FILESYSTEM
 #elif defined(THREADX) && !defined(WOLFSSL_WICED) && \
       !defined(THREADX_NO_DC_PRINTF)
-    #ifndef (NETOS)
+    #ifndef NETOS
         /* since just testing, use THREADX log printf instead (NETOS prototypes
          * this elsewhere) */
         int dc_log_printf(char*, ...);
diff --git a/wolfssl/test.h b/wolfssl/test.h
index d0abe2dfd..5448a0573 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -475,7 +475,7 @@ static WC_INLINE void InitTcpReady(tcp_ready* ready)
 }
 
 #ifdef NETOS
-    struct hostent* gethostbyname(vonst char* name);
+    struct hostent* gethostbyname(const char* name);
 #endif
 
 static WC_INLINE void FreeTcpReady(tcp_ready* ready)
diff --git a/wolfssl/wolfcrypt/asn_public.h b/wolfssl/wolfcrypt/asn_public.h
index f333cf97d..abae49469 100644
--- a/wolfssl/wolfcrypt/asn_public.h
+++ b/wolfssl/wolfcrypt/asn_public.h
@@ -33,6 +33,7 @@ This library defines the interface APIs for X509 certificates.
 
 #include <wolfssl/wolfcrypt/types.h>
 #include <wolfssl/wolfcrypt/dsa.h>
+#include <wolfssl/wolfcrypt/random.h>
 
 #ifdef __cplusplus
     extern "C" {
@@ -63,14 +64,6 @@ This library defines the interface APIs for X509 certificates.
     typedef struct RsaKey RsaKey;
     #define WC_RSAKEY_TYPE_DEFINED
 #endif
-#ifndef WC_RNG_TYPE_DEFINED
-    typedef struct OS_Seed OS_Seed;
-    typedef struct WC_RNG WC_RNG;
-    #ifdef WC_RNG_SEED_CB
-    typedef int (*wc_RngSeed_Cb)(OS_Seed* os, byte* seed, word32 sz);
-    #endif
-    #define WC_RNG_TYPE_DEFINED
-#endif
 #ifndef WC_DH_TYPE_DEFINED
     typedef struct DhKey DhKey;
     #define WC_DH_TYPE_DEFINED