diff --git a/components/ip_net2-6.9/Makefile b/components/ip_net2-6.9/Makefile index e3cda952..1760b99d 100644 --- a/components/ip_net2-6.9/Makefile +++ b/components/ip_net2-6.9/Makefile @@ -205,7 +205,6 @@ _VARLIST = \ COMPONENT_IPWPS \ COMPONENT_IPAPPL \ COMPONENT_IPCAVIUM \ - COMPONENT_IPCRYPTO \ COMPONENT_IPXINC \ COMPONENT_IPDHCPC6 \ COMPONENT_IPDHCPR \ @@ -241,7 +240,6 @@ _VARLIST = \ COMPONENT_IPRIPNG \ COMPONENT_IPSNTP \ COMPONENT_IPSSH \ - COMPONENT_IPSSL \ COMPONENT_IPTCP \ COMPONENT_IPSCTP \ COMPONENT_WLAN \ @@ -362,7 +360,6 @@ IpComps := \ IPAPPLDIR.ipappl \ IPCAVIUMDIR.ipcavium \ IPCOMDIR.ipcom \ - IPCRYPTODIR.ipcrypto \ IPDHCPC6DIR.ipdhcpc6 \ IPDHCPRDIR.ipdhcpr \ IPDHCPS6DIR.ipdhcps6 \ @@ -402,7 +399,6 @@ IpComps := \ IPSCTPDIR.ipsctp \ IPSNTPDIR.ipsntp \ IPSSHDIR.ipssh \ - IPSSL2DIR.ipssl2 \ IPTCPDIR.iptcp \ IPWLANDIR.ipwlan \ IPWPSDIR.ipwps \ diff --git a/components/ip_net2-6.9/common.vxconfig b/components/ip_net2-6.9/common.vxconfig index 6e838fd8..f4131c2e 100644 --- a/components/ip_net2-6.9/common.vxconfig +++ b/components/ip_net2-6.9/common.vxconfig @@ -743,7 +743,7 @@ config IPFTP_USE_TLS bool "Enable FTP with TLS" default n depends on COMPONENT_IPAPPL && MSP_KERNEL - select COMPONENT_IPSSL + select COMPONENT_IPCRYPTO help Enable FTP with TLS @@ -876,7 +876,7 @@ menu "Diameter Components" config IPDIAMETER_SEC_KEY_DB bool "Enable DIAMETER Secure key DB " - depends on (COMPONENT_IPDIAMETERP || COMPONENT_IPDIAMETERC) && COMPONENT_IPSSL + depends on (COMPONENT_IPDIAMETERP || COMPONENT_IPDIAMETERC) && COMPONENT_IPCRYPTO default n help This option enables Secure Key database support for Diameter components. @@ -1159,7 +1159,7 @@ config IPSNTP_SYSLOG_PRIORITY # config COMPONENT_IPNTP bool "Enable NTP" - default y + default n depends on !FEATURE_IPNET_INET6_ONLY && (MSP_KERNEL || MSP_RTP) && COMPONENT_IPSNTP && SUPPORTS_NTP help This option enables the Network Time protocol (NTP / RFC 1305) component. @@ -1331,22 +1331,6 @@ config COMPONENT_IPCRYPTO help This option enables ipcrypto, a port of the openssl encryption library, excluding the SSL part which is found in the ipssl component. If this option is deselected INCLUDE_IPCRYPTO, INCLUDE_IPCRYPTO_USE_CMDS and INCLUDE_IPCRYPTO_USE_TEST_CMDS will not be available in a VxWorks Image Project (VIP). -choice - prompt "Select openssl version to be built" - depends on COMPONENT_IPCRYPTO - default COMPONENT_IPCRYPTO_OPENSSL_1_0_2 - -config COMPONENT_IPCRYPTO_OPENSSL_0_9_8 - bool "Build openssl-0_9_8" - help - Select to build openssl-0_9_8 - -config COMPONENT_IPCRYPTO_OPENSSL_1_0_2 - bool "Build openssl-1_0_2" - help - Select to build openssl-1_0_2 without fips-140-2. -endchoice - config COMPONENT_IPCRYPTO_USE_FIPS_140_2 bool "Enable FIPS 140-2 validated crypto libraries" depends on MSP_KERNEL && !FEATURE_IPNET_INET6_ONLY && COMPONENT_IPCRYPTO_OPENSSL_0_9_8 && !DEFAULT_SIT_NB @@ -1472,7 +1456,7 @@ config IPEAP_USE_EAP_PEAP bool "Enable EAP PEAP" default y depends on COMPONENT_IPEAP - select COMPONENT_IPSSL + select COMPONENT_IPCRYPTO help This option enables EAP_PEAP support. @@ -1494,18 +1478,18 @@ config IPEAP_USE_EAP_TLS bool "Enable EAP TLS" default y depends on COMPONENT_IPEAP - select COMPONENT_IPSSL + select COMPONENT_IPCRYPTO help This option enables EAP_TLS support. -comment "EAP TTLS requires COMPONENT_IPSSL to be selected" - depends on COMPONENT_IPEAP && !IPEAP_USE_EAP_TTLS && !COMPONENT_IPSSL +comment "EAP TTLS requires COMPONENT_IPCRYPTO to be selected" + depends on COMPONENT_IPEAP && !IPEAP_USE_EAP_TTLS && !COMPONENT_IPCRYPTO config IPEAP_USE_EAP_TTLS bool "Enable EAP TTLS" default y - depends on COMPONENT_IPEAP && COMPONENT_IPSSL + depends on COMPONENT_IPEAP && COMPONENT_IPCRYPTO help This option enables EAP_TTLS support. @@ -1538,7 +1522,7 @@ config IPEAP_USE_EAP_COMMON_TLS config IPEAP_USE_EAP_COMMON_SIM bool default y if IPEAP_USE_EAP_SIM || IPEAP_USE_EAP_AKA - select COMPONENT_IPSSL + select COMPONENT_IPCRYPTO help This is a hidden component and will be selected if EAP SIM, and/or EAP AKA will be selected. # diff --git a/components/ip_net2-6.9/ipappl/config/00comp_ipnet_appl.cdf b/components/ip_net2-6.9/ipappl/config/00comp_ipnet_appl.cdf index 96458bd6..e1ae8c90 100644 --- a/components/ip_net2-6.9/ipappl/config/00comp_ipnet_appl.cdf +++ b/components/ip_net2-6.9/ipappl/config/00comp_ipnet_appl.cdf @@ -141,7 +141,7 @@ Component INCLUDE_IPFTPS_TLS { NAME FTP Server with TLS SYNOPSIS FTP Server with TLS MODULES ipftps_tls.o - REQUIRES INCLUDE_IPFTPS INCLUDE_IPSSL + REQUIRES INCLUDE_IPFTPS INCLUDE_IPCRYPTO CFG_PARAMS FTPS_TLS FTPS_TLS_CERT_FILE FTPS_TLS_KEY_FILE FTPS_TLS_SECRECT_KEY\ ENABLE_ADVANCE_FTPS_KEY_PRIVACY _CHILDREN FOLDER_FTP @@ -678,7 +678,7 @@ Parameter ENABLE_ADVANCE_FTPS_KEY_PRIVACY { Parameter FTPS_TLS_KEY_FILE { NAME TLS key file SYNOPSIS - REQUIRES INCLUDE_IPSSL + REQUIRES INCLUDE_IPCRYPTO TYPE char * DEFAULT "" } @@ -686,7 +686,7 @@ Parameter FTPS_TLS_KEY_FILE { Parameter FTPS_TLS_CERT_FILE { NAME TLS certificate file SYNOPSIS - REQUIRES INCLUDE_IPSSL + REQUIRES INCLUDE_IPCRYPTO TYPE char * DEFAULT "" } @@ -694,7 +694,7 @@ Parameter FTPS_TLS_CERT_FILE { Parameter FTPS_TLS { NAME Enable FTP server with TLS SYNOPSIS - REQUIRES INCLUDE_IPSSL + REQUIRES INCLUDE_IPCRYPTO TYPE char * DEFAULT "0" } @@ -702,7 +702,7 @@ Parameter FTPS_TLS { Parameter FTPS_TLS_SECRECT_KEY { NAME TLS secret key SYNOPSIS - REQUIRES INCLUDE_IPSSL + REQUIRES INCLUDE_IPCRYPTO TYPE char * DEFAULT "" } diff --git a/components/ip_net2-6.9/ipcom/gmake/ipcom_make.mk b/components/ip_net2-6.9/ipcom/gmake/ipcom_make.mk index 2868be8d..1ea2923e 100644 --- a/components/ip_net2-6.9/ipcom/gmake/ipcom_make.mk +++ b/components/ip_net2-6.9/ipcom/gmake/ipcom_make.mk @@ -30,6 +30,8 @@ endif # COMPILATION DEFAULTS ############################################################################# +IPIPDEFINE=-DIPCRYPTO_USE_TYPE_MAPPING + IPLD = $(IPCC) ifeq ("$(IPCOMPILER)","shc") IPCCOUT = -object=$@ @@ -292,6 +294,7 @@ IPCFLAGS += -include=$(dir $<)$(IPLIBINC)$(IPINC) else IPDEF := $(IPDEFINE) IPINC := $(IPINCLUDE) + ifeq ($(IPPORT),vxworks) # Avoid including OpenSSL files from the VxWorks distribution IPCFLAGS := $(IPINC) $(IPLIBINC) $(IPEXTRACFLAGS) $(IPCFLAGS) @@ -304,6 +307,7 @@ endif # generic IPCFLAGS += $(IPDEF) $(IPLIBDEF) IPCFLAGS += $(IPLIBFLAG) +IPCFLAGS += -I$(VSB_DIR)/3pp/openssl-3.5.0/include ############################################################################# diff --git a/components/ip_net2-6.9/ipcom/src/ipcom_auth.c b/components/ip_net2-6.9/ipcom/src/ipcom_auth.c index 8a6407c5..25e2dc49 100644 --- a/components/ip_net2-6.9/ipcom/src/ipcom_auth.c +++ b/components/ip_net2-6.9/ipcom/src/ipcom_auth.c @@ -222,22 +222,31 @@ IP_STATIC Ip_err ipcom_auth_userid_get(Ip_uid_t *userid) IP_STATIC Ip_err ipcom_auth_decode(const Ip_u8* in, int inl, Ip_u8* out, int* outl) { - EVP_ENCODE_CTX ctx; + EVP_ENCODE_CTX *ctx = IP_NULL; int i, outl_tmp = 0; - EVP_DecodeInit(&ctx); + ctx = EVP_ENCODE_CTX_new(); + if (ctx == IP_NULL) + return IPCOM_ERR_FAILED; - i = EVP_DecodeUpdate(&ctx, out, outl, in, inl); + EVP_DecodeInit(ctx); + + i = EVP_DecodeUpdate(ctx, out, outl, in, inl); outl_tmp = *outl + outl_tmp; - if (i < 0) + if (i < 0) { + EVP_ENCODE_CTX_free(ctx); return IPCOM_ERR_FAILED; + } - i = EVP_DecodeFinal(&ctx, out + outl_tmp, outl); - if (i < 0) + i = EVP_DecodeFinal(ctx, out + outl_tmp, outl); + if (i < 0) { + EVP_ENCODE_CTX_free(ctx); return IPCOM_ERR_FAILED; + } outl_tmp = *outl + outl_tmp; *outl = outl_tmp; + EVP_ENCODE_CTX_free(ctx); return IPCOM_SUCCESS; } #endif /* IPCOM_AUTH_USE_HASH */ @@ -660,7 +669,7 @@ IP_PUBLIC Ip_err ipcom_auth_hash_rtn_install(Ipcom_auth_hash_hook hash_rtn, IP_PUBLIC Ip_err ipcom_auth_default_hash_rtn(const char *password, const char *salt, Ip_size_t salt_len, char *buf) { char buf1[IPCOM_AUTH_PASSWORD_MAX]; - EVP_ENCODE_CTX ctx; + EVP_ENCODE_CTX* ctx = IP_NULL; int outl; int i; unsigned char* unsigned_buf = (unsigned char*)buf; @@ -675,9 +684,15 @@ IP_PUBLIC Ip_err ipcom_auth_default_hash_rtn(const char *password, const char *s SHA256((unsigned char*)buf1, salt_len+ipcom_strlen(password), unsigned_buf); /* Base64 encode hash */ - EVP_EncodeInit(&ctx); - EVP_EncodeUpdate(&ctx, unsigned_buf, &outl, unsigned_buf, 32); - EVP_EncodeFinal(&ctx, unsigned_buf+outl, &outl); + ctx = EVP_ENCODE_CTX_new(); + if (ctx == IP_NULL) + return IPCOM_ERR_FAILED; + + EVP_EncodeInit(ctx); + EVP_EncodeUpdate(ctx, unsigned_buf, &outl, unsigned_buf, 32); + EVP_EncodeFinal(ctx, unsigned_buf + outl, &outl); + + EVP_ENCODE_CTX_free(ctx); /* Remove terminating line feed */ for (i=(int)(ipcom_strlen((char*)unsigned_buf)-1); i>0 && unsigned_buf[i]=='\n';i--) @@ -687,6 +702,7 @@ IP_PUBLIC Ip_err ipcom_auth_default_hash_rtn(const char *password, const char *s } + /* *=========================================================================== * ipcom_auth_hash_get diff --git a/components/ip_net2-6.9/ipdiameter/config/02comp_ipnet_diameter.cdf b/components/ip_net2-6.9/ipdiameter/config/02comp_ipnet_diameter.cdf index 377a5f35..03beee59 100644 --- a/components/ip_net2-6.9/ipdiameter/config/02comp_ipnet_diameter.cdf +++ b/components/ip_net2-6.9/ipdiameter/config/02comp_ipnet_diameter.cdf @@ -102,7 +102,7 @@ Component INCLUDE_IPDIAMETERP_CMD { Component INCLUDE_IPDIAMETER_TLS_CFG { NAME Diameter TLS Configuration SYNOPSIS Diameter TLS configuration parameters - REQUIRES INCLUDE_IPSSL + REQUIRES INCLUDE_IPCRYPTO CFG_PARAMS DIAMETER_TLS_ENABLED \ DIAMETER_TLS_CERTIFICATE \ DIAMETER_TLS_ROOT_CERTIFICATE \ @@ -275,7 +275,7 @@ Parameter DIAMETER_TLS_ENABLED { NAME Enable TLS SYNOPSIS Control whether TLS is enabled or not on the local node. \ If set to "1", TLS is enabled on the local node; if set \ - to "0", it is disabled. If TLS is enabled, IPSSL and its \ + to "0", it is disabled. If TLS is enabled, IPCRYPTO and its \ requirements must be built, the other Diameter TLS \ configuration parameters must be configured properly, \ and certiface files and private key file must be loaded. diff --git a/components/ip_net2-6.9/ipeap/config/02comp_ipnet_eap.cdf b/components/ip_net2-6.9/ipeap/config/02comp_ipnet_eap.cdf index 6b05bc3f..bab19ac4 100644 --- a/components/ip_net2-6.9/ipeap/config/02comp_ipnet_eap.cdf +++ b/components/ip_net2-6.9/ipeap/config/02comp_ipnet_eap.cdf @@ -36,7 +36,7 @@ Component INCLUDE_IPEAP { #if defined(_WRS_CONFIG_IPEAP_USE_EAP_COMMON_TLS) || defined(_WRS_CONFIG_IPEAP_USE_EAP_SIM) || defined(_WRS_CONFIG_IPEAP_USE_EAP_AKA) Component INCLUDE_IPEAP { -REQUIRES INCLUDE_IPSSL +REQUIRES INCLUDE_IPCRYPTO } #endif diff --git a/components/webcli-4.9/common.vxconfig b/components/webcli-4.9/common.vxconfig index 271f6429..99be8e59 100644 --- a/components/webcli-4.9/common.vxconfig +++ b/components/webcli-4.9/common.vxconfig @@ -1,14 +1,14 @@ # config COMPONENT_WM bool "Enable WM" - default y + default n depends on MSP_KERNEL && !COMPONENT_IPCRYPTO_USE_FIPS_140_2 help This option allow user use WindManage WebCLI library, i.e. http client library. config WM_CLI_USE_SSH bool "Enable WM_CLI_USE_SSH" - default y + default n depends on COMPONENT_WM help This option allow WindManage user enable SSH for CLI. diff --git a/components/webcli-4.9/common.vxusrconfig b/components/webcli-4.9/common.vxusrconfig index 920f15ac..9fb4dab6 100644 --- a/components/webcli-4.9/common.vxusrconfig +++ b/components/webcli-4.9/common.vxusrconfig @@ -1,6 +1,6 @@ config COMPONENT_USR_WM bool"Build USR libraries for WM" - default y if COMPONENT_WM + default n if COMPONENT_WM depends on MSP_KERNEL && FEATURE_USR && !COMPONENT_IPCRYPTO_USE_FIPS_140_2 help This component will build the user libraries for the WM component diff --git a/vxworks-6.9/target/h/ipcrypto.h b/vxworks-6.9/target/h/ipcrypto.h index 71b8f90e..00c300cf 100644 --- a/vxworks-6.9/target/h/ipcrypto.h +++ b/vxworks-6.9/target/h/ipcrypto.h @@ -74,6 +74,16 @@ extern "C" { * 5 TYPES **************************************************************************** */ +#ifdef IPCRYPTO_USE_TYPE_MAPPING +typedef struct _AES_CMAC_CONTEXT +{ + Ip_u8 IV[AES_BLOCKSIZE]; /* IV initialization vector */ + Ip_u32 ivLength; /* IV length */ + Ip_u8 k1[AES_BLOCKSIZE]; /* k1 subkey */ + Ip_u8 k2[AES_BLOCKSIZE]; /* k2 subkey */ + AES_KEY aesKey; /* AES_KEY used for cipher */ +} AES_CMAC_CTX; +#endif /* Forward declaration */ struct env_md_st; diff --git a/vxworks-6.9/target/src/debug/wrproxy/Makefile b/vxworks-6.9/target/src/debug/wrproxy/Makefile index d63c5220..db2e3b03 100644 --- a/vxworks-6.9/target/src/debug/wrproxy/Makefile +++ b/vxworks-6.9/target/src/debug/wrproxy/Makefile @@ -48,6 +48,7 @@ ifdef _WRS_CONFIG_COMPONENT_IPSSL OBJS += wrProxySslLib.o override ADDED_CFLAGS += -D_WRS_CONFIG_SSL +EXTRA_INCLUDE += -I$(VSB_DIR)/3pp/openssl-3.5.0/include # wrProxySslLib.c needs ipnet header files, this is the way to reach them diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/asn1.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/asn1.h.in index 68391c73..11da44f9 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/asn1.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/asn1.h.in @@ -22,10 +22,14 @@ use OpenSSL::stackhash qw(generate_stack_macros); # define HEADER_ASN1_H # endif -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif +# include # endif -# include # include # include # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bio.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bio.h.in index 228e00e0..850904cf 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bio.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bio.h.in @@ -23,8 +23,12 @@ use OpenSSL::stackhash qw(generate_stack_macros); # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bn.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bn.h index ea706dca..53809294 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bn.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/bn.h @@ -18,8 +18,12 @@ # endif # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # include # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/conf.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/conf.h.in index 56632870..4c25c706 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/conf.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/conf.h.in @@ -28,8 +28,12 @@ use OpenSSL::stackhash qw(generate_stack_macros generate_lhash_macros); # include # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif #ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/crypto.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/crypto.h.in index 4bc4f891..5ab8e1ac 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/crypto.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/crypto.h.in @@ -24,12 +24,16 @@ use OpenSSL::stackhash qw(generate_stack_macros); # endif # include -# include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif +# include # endif # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/decoder.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/decoder.h index d4ee2cf4..5181bd93 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/decoder.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/decoder.h @@ -13,8 +13,12 @@ # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # include # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dh.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dh.h index 97024929..50a82811 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dh.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dh.h @@ -83,8 +83,12 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **ukm); # define EVP_PKEY_DH_KDF_NONE 1 # define EVP_PKEY_DH_KDF_X9_42 2 -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # ifndef OPENSSL_NO_DH # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dsa.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dsa.h index 1142855e..554f9790 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dsa.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/dsa.h @@ -31,8 +31,12 @@ # include # endif # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # endif diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/e_os2.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/e_os2.h index 7d73e091..6aee0bf8 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/e_os2.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/e_os2.h @@ -224,7 +224,6 @@ extern "C" { # endif /* Standard integer types */ -# define OPENSSL_NO_INTTYPES_H # define OPENSSL_NO_STDINT_H # if defined(OPENSSL_SYS_UEFI) typedef INT8 int8_t; @@ -239,13 +238,11 @@ typedef UINTN uintptr_t; # elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ defined(__osf__) || defined(__sgi) || defined(__hpux) || \ defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__) -# include -# undef OPENSSL_NO_INTTYPES_H -/* Because the specs say that inttypes.h includes stdint.h if present */ +# include # undef OPENSSL_NO_STDINT_H # elif defined(_MSC_VER) && _MSC_VER<1600 /* - * minimally required typdefs for systems not supporting inttypes.h or + * minimally required typdefs for systems not supporting * stdint.h: currently just older VC++ */ typedef signed char int8_t; diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ec.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ec.h index e1cbe982..96c94e95 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ec.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ec.h @@ -88,8 +88,12 @@ typedef enum { const char *OSSL_EC_curve_nid2name(int nid); -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # ifndef OPENSSL_NO_EC # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/encoder.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/encoder.h index c37a6f16..b16a91d3 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/encoder.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/encoder.h @@ -13,8 +13,12 @@ # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # include # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/err.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/err.h.in index 9143704c..1915ee88 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/err.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/err.h.in @@ -22,9 +22,13 @@ use OpenSSL::stackhash qw(generate_lhash_macros); # include -# ifndef OPENSSL_NO_STDIO -# include -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# include +# endif # endif # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/evp.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/evp.h index 288d8af2..3a763856 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/evp.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/evp.h @@ -18,8 +18,12 @@ # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/lhash.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/lhash.h.in index 63a9c53b..7399c0e0 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/lhash.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/lhash.h.in @@ -26,8 +26,12 @@ use OpenSSL::stackhash qw(generate_lhash_macros); # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif #ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pem.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pem.h index 94424e6c..4ed74e18 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pem.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pem.h @@ -22,8 +22,12 @@ # include # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif #ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs12.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs12.h.in index 097afba3..c2ee8bd9 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs12.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs12.h.in @@ -26,8 +26,12 @@ use OpenSSL::stackhash qw(generate_stack_macros); # include # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif #ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs7.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs7.h.in index 57e45dc2..68db8690 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs7.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/pkcs7.h.in @@ -29,8 +29,12 @@ use OpenSSL::stackhash qw(generate_stack_macros); # include # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif #ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/rsa.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/rsa.h index 4fb5e938..9f7b5d0d 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/rsa.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/rsa.h @@ -27,8 +27,12 @@ # endif # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/srp.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/srp.h.in index dfbe845b..371db9aa 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/srp.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/srp.h.in @@ -29,7 +29,11 @@ use OpenSSL::stackhash qw(generate_stack_macros); #include #ifndef OPENSSL_NO_SRP -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# include +# endif # include # include # include diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ts.h b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ts.h index 31c78b55..7e231c80 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ts.h +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/ts.h @@ -32,8 +32,12 @@ # include # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif # ifdef __cplusplus extern "C" { diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509.h.in index 809b9c64..666d515b 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509.h.in @@ -41,8 +41,12 @@ use OpenSSL::stackhash qw(generate_stack_macros); # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif #ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509v3.h.in b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509v3.h.in index baf8b5ab..096113d7 100644 --- a/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509v3.h.in +++ b/vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/x509v3.h.in @@ -26,8 +26,12 @@ use OpenSSL::stackhash qw(generate_stack_macros); # include # include # include -# ifndef OPENSSL_NO_STDIO -# include +# if defined(IPCRYPTO_USE_TYPE_MAPPING) +# include +# else +# ifndef OPENSSL_NO_STDIO +# include +# endif # endif #ifdef __cplusplus diff --git a/vxworks-6.9/target/src/openssl/ipcrypto/Makefile b/vxworks-6.9/target/src/openssl/ipcrypto/Makefile index 76de2fe5..a169f51f 100644 --- a/vxworks-6.9/target/src/openssl/ipcrypto/Makefile +++ b/vxworks-6.9/target/src/openssl/ipcrypto/Makefile @@ -30,6 +30,7 @@ EXTRA_INCLUDE += -I$(IPCOM_DIR)/config EXTRA_INCLUDE += -I$(IPCOM_DIR)/port/vxworks/config EXTRA_INCLUDE += -I$(IPCOM_DIR)/port/vxworks/include EXTRA_INCLUDE += -I$(TGT_DIR)/h/security +EXTRA_INCLUDE += -I$(VSB_DIR)/3pp/openssl-3.5.0/include ifneq ($(SPACE),user) OBJS = ipcrypto_cmd_cmp.o diff --git a/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile b/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile index 56bfbd58..36cec32d 100644 --- a/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile +++ b/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile @@ -16,6 +16,7 @@ LIB_FORMAT = both include $(WIND_BASE)/target/h/make/defs.library +EXTRA_INCLUDE += -I$(VSB_DIR)/3pp/openssl-3.5.0/include EXTRA_INCLUDE += -I$(TGT_DIR)/h/security EXTRA_DEFINE += -D_WRS_CONFIG_OPENSSL diff --git a/vxworks-6.9/target/src/openssl/openssl_src/vxworks.krnl.mak b/vxworks-6.9/target/src/openssl/openssl_src/vxworks.krnl.mak index 217a42b1..f94b7bb0 100644 --- a/vxworks-6.9/target/src/openssl/openssl_src/vxworks.krnl.mak +++ b/vxworks-6.9/target/src/openssl/openssl_src/vxworks.krnl.mak @@ -84,7 +84,5 @@ install: mv providers/libcommon.a $(VSB_DIR)/$(VX_CPU_FAMILY)/$(CPU)/common/ mv providers/libdefault.a $(VSB_DIR)/$(VX_CPU_FAMILY)/$(CPU)/common/ mv providers/liblegacy.a $(VSB_DIR)/$(VX_CPU_FAMILY)/$(CPU)/common/ - cd $(VSB_DIR)/$(VX_CPU_FAMILY)/$(CPU)/common && mv libipcrypto.a libipcrypto._a - cd $(VSB_DIR)/$(VX_CPU_FAMILY)/$(CPU)/common && mv libipcrypto_apps.a libipcrypto_apps._a - cd $(VSB_DIR)/$(VX_CPU_FAMILY)/$(CPU)/common && mv libipssl.a libipssl._a + diff --git a/vxworks-6.9/target/src/os/Makefile b/vxworks-6.9/target/src/os/Makefile index e8606600..3bda606f 100644 --- a/vxworks-6.9/target/src/os/Makefile +++ b/vxworks-6.9/target/src/os/Makefile @@ -160,6 +160,8 @@ LIB_BASE_NAME = os # It must be after LIB_BASE_NAME include $(TGT_DIR)/h/make/defs.library +EXTRA_INCLUDE += -I$(VSB_DIR)/3pp/openssl-3.5.0/include + DOC_FILES= clockLib.c cpuset.c \ edrLib.c edrShow.c edrSysDbgLib.c edrErrLogLib.c \ envLib.c errnoLib.c excLib.c ffsLib.c hashLib.c intLib.c \ diff --git a/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile b/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile index 25f640f2..a59f3a24 100644 --- a/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile +++ b/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile @@ -27,6 +27,8 @@ EXTRA_INCLUDE += -I$(IPCOM_DIR)/include EXTRA_INCLUDE += -I$(IPCOM_DIR)/config EXTRA_INCLUDE += -I$(IPCOM_DIR)/port/vxworks/config EXTRA_INCLUDE += -I$(IPCOM_DIR)/port/vxworks/include +EXTRA_INCLUDE += -I$(VSB_DIR)/3pp/openssl-3.5.0/include + ifdef _WRS_CONFIG_CORE__BANNED_H ADDED_CFLAGS += -include banned.h endif diff --git a/vxworks-6.9/target/src/ossl350_prepare/Makefile b/vxworks-6.9/target/src/ossl350_prepare/Makefile index a51c6c97..66533a12 100644 --- a/vxworks-6.9/target/src/ossl350_prepare/Makefile +++ b/vxworks-6.9/target/src/ossl350_prepare/Makefile @@ -26,11 +26,4 @@ generate-headers: @if [ -d "$(INTERNAL_DST_DIR)" ]; then \ rm -r $(INTERNAL_DST_DIR);\ fi - mkdir -p $(OPENSSL_DST_DIR) - mkdir -p $(CRYPTO_DST_DIR) - mkdir -p $(INTERNAL_DST_DIR) - cp -r $(OSSL_BUILD_DIR)/include/openssl $(TGT_DIR)/h - cp -r $(OSSL_BUILD_DIR)/include/crypto $(TGT_DIR)/h - cp -r $(OSSL_BUILD_DIR)/include/internal $(TGT_DIR)/h - cp -r $(OSSL_BUILD_DIR)/crypto/evp/evp_local.h $(OPENSSL_DST_DIR)