VSB changes for diab toolchain and customer BSP (#37)

Co-authored-by: neelimap <neelimaps@neominds.in>
Reviewed-on: http://13.234.246.121:3000/Neominds/ossl35vx69/pulls/37
Co-authored-by: Neelima P S <neelima.ps@neominds.in>
Co-committed-by: Neelima P S <neelima.ps@neominds.in>

components/webcli-4.9/target/src/wrn/wm/curl/lib/libcurl_http_ntlm.c

@@ -35,7 +35,8 @@
 #ifdef __VxWORKS__
 #include <vxWorks.h>
 #include <stdio.h>
-#include <openssl/evp.h>
+#include <crypto/evp.h>
+#include <openssl/evp_local.h>
 #include <openssl/ossl_typ.h>
 
 #define CURL_NTML_KEY_LENGTH        7

components/webcli-4.9/target/src/wrn/wm/curl/lib/libcurl_ssluse.c

@@ -1054,29 +1054,7 @@ static CURLcode verifyhost(struct connectdata *conn,
 
 static const char *ssl_msg_type(int ssl_ver, int msg)
 {
-  if (ssl_ver == SSL2_VERSION_MAJOR) {
-    switch (msg) {
-      case SSL2_MT_ERROR:
-        return "Error";
-      case SSL2_MT_CLIENT_HELLO:
-        return "Client hello";
-      case SSL2_MT_CLIENT_MASTER_KEY:
-        return "Client key";
-      case SSL2_MT_CLIENT_FINISHED:
-        return "Client finished";
-      case SSL2_MT_SERVER_HELLO:
-        return "Server hello";
-      case SSL2_MT_SERVER_VERIFY:
-        return "Server verify";
-      case SSL2_MT_SERVER_FINISHED:
-        return "Server finished";
-      case SSL2_MT_REQUEST_CERTIFICATE:
-        return "Request CERT";
-      case SSL2_MT_CLIENT_CERTIFICATE:
-        return "Client CERT";
-    }
-  }
-  else if (ssl_ver == SSL3_VERSION_MAJOR) {
+  if (ssl_ver == SSL3_VERSION_MAJOR) {
     switch (msg) {
       case SSL3_MT_HELLO_REQUEST:
         return "Hello request";
@@ -1132,8 +1110,7 @@ static void ssl_tls_trace(int direction, int ssl_ver, int content_type,
 
   data = conn->data;
   ssl_ver >>= 8;
-  ver = (ssl_ver == SSL2_VERSION_MAJOR ? '2' :
-         ssl_ver == SSL3_VERSION_MAJOR ? '3' : '?');
+  ver = (ssl_ver == SSL3_VERSION_MAJOR ? '3' : '?');
 
   /* SSLv2 doesn't seem to have TLS record-type headers, so OpenSSL
    * always pass-up content-type as 0. But the interesting message-type
@@ -1521,7 +1498,7 @@ Curl_ossl_connect(struct connectdata *conn,
     return CURLE_SSL_CONNECT_ERROR;
   }
   infof(data, "\t subject: %s\n", str);
-  CRYPTO_free(str);
+  OPENSSL_free(str);
 
   certdate = X509_get_notBefore(connssl->server_cert);
   Curl_ASN1_UTCTIME_output(conn, "\t start date: ", certdate);
@@ -1546,7 +1523,7 @@ Curl_ossl_connect(struct connectdata *conn,
   }
   else {
     infof(data, "\t issuer: %s\n", str);
-    CRYPTO_free(str);
+    OPENSSL_free();
 
     /* We could do all sorts of certificate verification stuff here before
        deallocating the certificate. */

vxworks-6.9/target/src/os/security/secCrypto/src/secSecretLib.c

@@ -77,6 +77,9 @@ SEE ALSO
 #include <sysLib.h>
 
 /* typedefs */
+#ifndef __SIZE_TYPE
+#define __SIZE_TYPE long unsigned int
+#endif
 typedef __SIZE_TYPE__ rsize_t;   
 typedef int errno_t;