Merge pull request 'fix compilation warnings' (#67) from fix_compilation_warnings into master

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

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/crypto/ec/curve448/field.h

@@ -25,16 +25,16 @@
 # if defined(__GNUC__) || defined(__clang__)
 #  define INLINE_UNUSED __inline__ __attribute__((__unused__,__always_inline__))
 #  define RESTRICT __restrict__
-#  define ALIGNED __attribute__((__aligned__(16)))
+#  define OSSL_ALIGNED __attribute__((__aligned__(16)))
 # else
 #  define INLINE_UNUSED ossl_inline
 #  define RESTRICT
-#  define ALIGNED
+#  define OSSL_ALIGNED
 # endif
 
 typedef struct gf_s {
     word_t limb[NLIMBS];
-} ALIGNED gf_s, gf[1];
+} OSSL_ALIGNED gf_s, gf[1];
 
 /* RFC 7748 support */
 # define X_PUBLIC_BYTES  X_SER_BYTES

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

@@ -42,6 +42,7 @@
 #include "ipcrypto_config.h"
 #include <openssl/crypto.h>
 #include <vxtss_symlist.h>
+#include <taskHookLib.h>
 #endif
 
 static int stopped = 0;

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

@@ -1194,7 +1194,7 @@ int RAND_poll(void)
     
     for (i=0;i<10;i++)
     {
-        if (randPseudoBytes(tmp, sizeof(tmp)) == OK)
+        if (randPseudoBytes((unsigned char *)tmp, sizeof(tmp)) == OK)
             (void)RAND_add(tmp, sizeof(tmp), sizeof(tmp));
         else
             return 0;

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/crypto/threads_vxworks.c

@@ -13,6 +13,7 @@
 #include <vxWorks.h>
 #include <private/semLibP.h>
 #include <openssl/crypto.h>
+#include <vxtss.h>
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && defined(OPENSSL_SYS_VXWORKS)
 

vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/crypto/txt_db/txt_db.c

@@ -14,15 +14,15 @@
 #include <openssl/buffer.h>
 #include <openssl/txt_db.h>
 
-#undef BUFSIZE
-#define BUFSIZE 512
+#undef OSSL_TXT_DB_BUFSIZE
+#define OSSL_TXT_DB_BUFSIZE 512
 
 TXT_DB *TXT_DB_read(BIO *in, int num)
 {
     TXT_DB *ret = NULL;
     int esc = 0;
     int i, add, n;
-    int size = BUFSIZE;
+    int size = OSSL_TXT_DB_BUFSIZE;
     int offset = 0;
     char *p, *f;
     OPENSSL_STRING *pp;
@@ -54,7 +54,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
     offset = 0;
     for (;;) {
         if (offset != 0) {
-            size += BUFSIZE;
+            size += OSSL_TXT_DB_BUFSIZE;
             if (!BUF_MEM_grow_clean(buf, size))
                 goto err;
         }