Merge pull request 'Changes to compile openssl-3.1.7 in vx6.9' (#4) from ossl_compilation into master

Reviewed-on: http://13.234.246.121:3000/Neominds/ossl35vx69/pulls/4

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.1.7/crypto/init.c

@@ -798,10 +798,9 @@ int ipcrypto_init_internal(SEM_ID semId)
 
 #if defined (_WRS_KERNEL)
         /* use shareable FILEs rather than task-specific stdout/stderr */
-        FILE * fpout = _Files[1];
-        FILE * fperr = _Files[2];
-        bio_out = BIO_new_fp(fpout, BIO_NOCLOSE | BIO_FP_TEXT);
-        bio_err = BIO_new_fp(fperr, BIO_NOCLOSE | BIO_FP_TEXT);
+        
+        bio_out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 #else
         bio_out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
         bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.1.7/crypto/rand/rand_lib.c

@@ -967,7 +967,23 @@ int RAND_set_seed_source_type(OSSL_LIB_CTX *ctx, const char *seed,
 
 #if defined(OPENSSL_SYS_VXWORKS_SUPPORT)&&!defined(FIPS_MODULE)
 #include <vxWorks.h>
-#include <randomNumGen.h>
+#include <stdLib.h>
+#include <tickLib.h>
+
+int randPseudoBytes(unsigned char * randBuf, int numOfBytes)
+{
+	int i;
+
+	srand((unsigned int)tickGet());
+
+	for (i = 0; i < numOfBytes; i++) 
+	{
+		/* take lowest 8 bits */
+		randBuf[i] = (uint8_t)(rand() & 0xFF);  
+	}
+
+	return OK;
+}
 
 int RAND_poll(void)
 {

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.1.7/include/openssl/crypto.h.in

@@ -59,7 +59,6 @@ use OpenSSL::stackhash qw(generate_stack_macros);
    typedef int            once_flag;
    typedef unsigned int   tss_t;
 #  ifndef __cplusplus
-    #include <threads.h>
 #  endif
 # endif
 
@@ -500,6 +499,15 @@ typedef LONG CRYPTO_ONCE;
 typedef once_flag CRYPTO_ONCE;
 typedef tss_t CRYPTO_THREAD_LOCAL;
 typedef TASK_ID CRYPTO_THREAD_ID;
+
+typedef struct
+    {
+    int initialized;
+    SEM_ID sem;
+    }CRYPTO_ONCE_STATIC_INIT;
+
+#   define ONCE_FLAG_INIT {0, NULL}
+
 #   define CRYPTO_ONCE_STATIC_INIT ONCE_FLAG_INIT
 #  else
 #   if defined(__TANDEM) && defined(_SPT_MODEL_)

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.1.7/providers/implementations/rands/seeding/rand_vxworks.c

@@ -31,7 +31,29 @@
 #endif
 
 #if defined(OPENSSL_SYS_VXWORKS)
-# include <randomNumGen.h>
+#include <stdLib.h>
+#include <tickLib.h>
+
+int randSecure (void)
+{
+	return OK;
+}
+
+STATUS randUBytes (unsigned char * randBuf, int numOfBytes)
+{
+	int i;
+
+	srand((unsigned int)tickGet());
+
+	for (i = 0; i < numOfBytes; i++) 
+	{
+		/* take lowest 8 bits */
+		randBuf[i] = (uint8_t)(rand() & 0xFF);  
+	}
+
+	return OK;	
+}
+
 #endif
 
 /* Macro to convert two thirty two bit values into a sixty four bit one */

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.1.7/providers/implementations/storemgmt/file_store.c

@@ -10,6 +10,7 @@
 /* This file has quite some overlap with engines/e_loader_attic.c */
 
 #include <string.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>  /* isdigit */
 #include <assert.h>