-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Create package openssl3 * Create package openssl3 * Delete openssl3 * update version to 3.0.1 * Delete openssl3 * Update manifests to 3.0.1 * Fix download url * Update port version * Update version * Remove wrong port version * Fix errors * Fix license * Remove empty folders * Fix post-build errors * Add license field * Fix cmake for uwp * Remove patch file * format manifest * Update version file * Fix port version * version * Test: remove vcvarsall * version * fix version * version * Fix docs in cmake files as well * wrong branch * Add port openssl-1 * Fix directories * delete openssl-1 * [openssl-1] Add port * version * Fix UWP build * version * migrate uthenticode * version * Fix UWP build for librabbitmq * version * Fix UWP warnings * version * Fix patch * version * Disable C4996 on UWP * version * [idevicerestore] disable C4996 * remove warning fixes * Revert uthenticode * Final newlines * version * Remove winsock replace * version * [libwebsockets] Disable /WX on Windows * version * Typo * version * Disable C4996 in patch instead * version * [luasec] Use openssl-1 * version * revert luasec * migrate luasec * version * revert winsock * version * revert winsock * version * revert revert * version * Fix platform for luasec * Fix supports * version * . * version * uthenticode * libmysql * azure-c-shared-utility * version * remove azure-c-shared-utility * revert all * uthenticode * version * azure * version * libmysql * version * remove mysql * [libdatachannel] disable warnings on UWP * version * Fix patches * version * Add openssl-1 to CI baseline * openssl-1: check if copyright exists * version * revert azure * [libssh2] disable c4996 * version * [aws-sdk-cpp] -Wno-deprecated * version * fix aws patch * version * fix aws patch * version * [qpid-proton] disable warning * version * Fix patch * version * [librtmp] disable c4996 * version * [libu2f-server] disablec4996 * switch version scheme * version * [idevicerestore] disable c4996 * version * typo * version * fix cmake * version * fix cmake again * version * [uthenticode] patch to support Openssl 3 * version * fix idevicerestore * version * search for conflicting copyrights * version * Fix luasec * fix version * version * fix azure * version * Remove debug stuff * version * [open62541] patch * update port version * version * [libmysql] patch * version * Fix patch * version * Format openssl * Format openssl portfiles * Check for conflicting copyrights * Fix typo * Rename openssl-1 to openssl1 * Rename openssl-1 to openssl1 * version * Update ci baseline * version * resolve conflicting port versions * version * apply latest openssl security fix * version * Fix qpid-proton * version * retrigger Bbuild of qtbase * version * revert qtbase * Remove openssl1 * version * version * fix openssl_version_fix Co-authored-by: nicole mazzuca <[email protected]>
- Loading branch information
1 parent
89295c9
commit 407bc79
Showing
59 changed files
with
506 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake | ||
index cae5b92248..1aa728b01c 100644 | ||
--- a/cmake/compiler_settings.cmake | ||
+++ b/cmake/compiler_settings.cmake | ||
@@ -53,7 +53,7 @@ macro(set_gcc_flags) | ||
endmacro() | ||
|
||
macro(set_gcc_warnings) | ||
- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") | ||
+ list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra") | ||
if(COMPILER_CLANG) | ||
if(PLATFORM_ANDROID) | ||
# when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c | ||
index 5a9e5ac2..bb946c2d 100644 | ||
--- a/adapters/x509_openssl.c | ||
+++ b/adapters/x509_openssl.c | ||
@@ -75,7 +75,7 @@ static int load_certificate_chain(SSL_CTX* ssl_ctx, const char* certificate) | ||
// certificates. | ||
|
||
/* Codes_SRS_X509_OPENSSL_07_006: [ If successful x509_openssl_add_ecc_credentials shall to import each certificate in the cert chain. ] */ | ||
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) | ||
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) | ||
SSL_CTX_clear_extra_chain_certs(ssl_ctx); | ||
#else | ||
if (ssl_ctx->extra_certs != NULL) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 26 additions & 5 deletions
31
ports/idevicerestore/libcurl_d.patch → ports/idevicerestore/fix-vcxproj.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,44 @@ | ||
diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj | ||
index fa209fae..cf89306b 100644 | ||
index fa209fa..6afa088 100644 | ||
--- a/idevicerestore.vcxproj | ||
+++ b/idevicerestore.vcxproj | ||
@@ -94,7 +94,7 @@ | ||
+++ b/idevicerestore.vcxproj | ||
@@ -92,9 +92,10 @@ | ||
<Optimization>Disabled</Optimization> | ||
<SDLCheck>true</SDLCheck> | ||
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> | ||
+ <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Link> | ||
- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
</Link> | ||
</ItemDefinitionGroup> | ||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
@@ -105,7 +105,7 @@ | ||
@@ -103,9 +104,10 @@ | ||
<Optimization>Disabled</Optimization> | ||
<SDLCheck>true</SDLCheck> | ||
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> | ||
+ <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Link> | ||
- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
</Link> | ||
</ItemDefinitionGroup> | ||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
|
||
@@ -116,6 +118,7 @@ | ||
<IntrinsicFunctions>true</IntrinsicFunctions> | ||
<SDLCheck>true</SDLCheck> | ||
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> | ||
+ <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Link> | ||
<EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
@@ -131,6 +134,7 @@ | ||
<IntrinsicFunctions>true</IntrinsicFunctions> | ||
<SDLCheck>true</SDLCheck> | ||
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> | ||
+ <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Link> | ||
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index b79b458..790bf95 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -385,6 +385,9 @@ if(WARNINGS_AS_ERRORS) | ||
endif() | ||
endif() | ||
|
||
+target_compile_options(datachannel PRIVATE /wd4996) | ||
+target_compile_options(datachannel-static PRIVATE /wd4996) | ||
+ | ||
install(TARGETS datachannel EXPORT LibDataChannelTargets | ||
RUNTIME DESTINATION bin | ||
LIBRARY DESTINATION lib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc | ||
index dea997b252c..81484f0652b 100644 | ||
--- a/mysys/my_md5.cc | ||
+++ b/mysys/my_md5.cc | ||
@@ -35,6 +35,10 @@ | ||
#include <openssl/crypto.h> | ||
#include <openssl/md5.h> | ||
|
||
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L | ||
+#include <openssl/evp.h> | ||
+#endif | ||
+ | ||
static void my_md5_hash(unsigned char *digest, unsigned const char *buf, | ||
int len) { | ||
MD5_CTX ctx; | ||
@@ -56,7 +60,11 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, | ||
int compute_md5_hash(char *digest, const char *buf, int len) { | ||
int retval = 0; | ||
int fips_mode = 0; | ||
+ #if OPENSSL_VERSION_NUMBER < 0x30000000L | ||
fips_mode = FIPS_mode(); | ||
+ #else | ||
+ fips_mode = EVP_default_properties_is_fips_enabled(NULL); | ||
+ #endif | ||
/* If fips mode is ON/STRICT restricted method calls will result into abort, | ||
* skipping call. */ | ||
if (fips_mode == 0) { | ||
diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc | ||
index 13bc6794ea5..8752bcea9bf 100644 | ||
--- a/plugin/x/client/xconnection_impl.cc | ||
+++ b/plugin/x/client/xconnection_impl.cc | ||
@@ -51,6 +51,10 @@ | ||
#include "plugin/x/src/config/config.h" | ||
#include "sql-common/net_ns.h" | ||
|
||
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L | ||
+#include <openssl/evp.h> | ||
+#endif | ||
+ | ||
#ifndef WIN32 | ||
#include <netdb.h> | ||
#include <sys/socket.h> | ||
@@ -524,12 +528,20 @@ int set_fips_mode(const uint32_t fips_mode, | ||
if (fips_mode > 2) { | ||
goto EXIT; | ||
} | ||
+ #if OPENSSL_VERSION_NUMBER < 0x30000000L | ||
fips_mode_old = FIPS_mode(); | ||
+ #else | ||
+ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); | ||
+ #endif | ||
if (fips_mode_old == fips_mode) { | ||
rc = 1; | ||
goto EXIT; | ||
} | ||
+ #if OPENSSL_VERSION_NUMBER < 0x30000000L | ||
if (!(rc = FIPS_mode_set(fips_mode))) { | ||
+ #else | ||
+ if (!(rc = EVP_default_properties_enable_fips(fips_mode))) { | ||
+ #endif | ||
err_library = ERR_get_error(); | ||
ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); | ||
err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; | ||
diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc | ||
index 6c04029ccb0..164b727e3dc 100644 | ||
--- a/vio/viosslfactories.cc | ||
+++ b/vio/viosslfactories.cc | ||
@@ -40,6 +40,10 @@ | ||
|
||
#include <openssl/dh.h> | ||
|
||
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L | ||
+#include <openssl/evp.h> | ||
+#endif | ||
+ | ||
#if OPENSSL_VERSION_NUMBER < 0x10002000L | ||
#include <openssl/ec.h> | ||
#endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */ | ||
@@ -498,12 +502,20 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { | ||
if (fips_mode > 2) { | ||
goto EXIT; | ||
} | ||
+ #if OPENSSL_VERSION_NUMBER < 0x30000000L | ||
fips_mode_old = FIPS_mode(); | ||
+ #else | ||
+ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); | ||
+ #endif | ||
if (fips_mode_old == fips_mode) { | ||
rc = 1; | ||
goto EXIT; | ||
} | ||
+ #if OPENSSL_VERSION_NUMBER < 0x30000000L | ||
if (!(rc = FIPS_mode_set(fips_mode))) { | ||
+ #else | ||
+ if (!(rc = EVP_default_properties_enable_fips(NULL, fips_mode))) { | ||
+ #endif | ||
/* | ||
If OS doesn't have FIPS enabled openssl library and user sets FIPS mode | ||
ON, It fails with proper error. But in the same time it doesn't allow to | ||
@@ -511,7 +523,11 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { | ||
error, setting old working FIPS mode value in the OpenSSL library. It will | ||
allow successful cryptographic operation and will not abort the server. | ||
*/ | ||
+ #if OPENSSL_VERSION_NUMBER < 0x30000000L | ||
FIPS_mode_set(fips_mode_old); | ||
+ #else | ||
+ EVP_default_properties_enable_fips(NULL, fips_mode_old); | ||
+ #endif | ||
err_library = ERR_get_error(); | ||
ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); | ||
err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; | ||
@@ -525,7 +541,13 @@ EXIT: | ||
|
||
@returns openssl current fips mode | ||
*/ | ||
+#if OPENSSL_VERSION_NUMBER < 0x30000000L | ||
uint get_fips_mode() { return FIPS_mode(); } | ||
+#else | ||
+uint get_fips_mode() { | ||
+ return EVP_default_properties_is_fips_enabled(NULL); | ||
+} | ||
+#endif | ||
|
||
long process_tls_version(const char *tls_version) { | ||
const char *separator = ","; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake | ||
index b176d30..e986461 100644 | ||
--- a/cmake/max_warnings.cmake | ||
+++ b/cmake/max_warnings.cmake | ||
@@ -13,6 +13,8 @@ if(MSVC) | ||
|
||
# Disable broken warnings | ||
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) | ||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") | ||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") | ||
elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) | ||
if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.