|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
diff --git a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
index 8a190d2..6b4c5ae 100644
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
--- a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
+++ b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
@@ -2653,6 +2653,13 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
* or by using the SSL_CONF library.
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
*/
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
ret->options |= SSL_OP_NO_COMPRESSION;
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ /*
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ * Disable SSLv3 by default. Applications can
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ * re-enable it by configuring
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ * SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ * or by using the SSL_CONF library.
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ */
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ ret->options |= SSL_OP_NO_SSLv3;
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
ret->tlsext_status_type = -1;
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
index 2cbbddd..1a409d1 100644
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
@@ -277,6 +277,7 @@ static int execute_test(SSL_TEST_FIXTURE fixture)
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
SSL_TEST_SERVERNAME_CB_NONE) {
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
server2_ctx = SSL_CTX_new(TLS_server_method());
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
TEST_check(server2_ctx != NULL);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(server2_ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
}
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
client_ctx = SSL_CTX_new(TLS_client_method());
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
TEST_check(SSL_CTX_set_max_proto_version(client_ctx, TLS_MAX_VERSION));
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
@@ -290,11 +291,15 @@ static int execute_test(SSL_TEST_FIXTURE fixture)
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
TLS_MAX_VERSION));
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
TEST_check(resume_server_ctx != NULL);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
TEST_check(resume_client_ctx != NULL);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(resume_server_ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(resume_client_ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
}
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
}
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
TEST_check(server_ctx != NULL);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
TEST_check(client_ctx != NULL);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(server_ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(client_ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
TEST_check(CONF_modules_load(conf, fixture.test_app, 0) > 0);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
index e77c692..e586072 100644
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
@@ -1460,6 +1460,11 @@ int main(int argc, char *argv[])
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
ERR_print_errors(bio_err);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
goto end;
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
}
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(c_ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(s_ctx, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+ SSL_CTX_clear_options(s_ctx2, SSL_OP_NO_SSLv3);
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
+
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
/*
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
* Since we will use low security ciphersuites and keys for testing set
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
91c79aa |
* security level to zero by default. Tests can override this by adding
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
--
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
2.17.0
|
|
![](https://seccdn.libravatar.org/avatar/b58b3d205f0c82b289646cc4d253a4ca9ebdbbfea8dc7d471e83622d74741b05?s=16&d=retro) |
7ae6f15 |
|