Accepting request 646433 from home:vitezslav_cizek:branches:security:tls

drop accidentally added useless patch

OBS-URL: https://build.opensuse.org/request/show/646433
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=25
This commit is contained in:
Vítězslav Čížek 2018-11-05 14:46:47 +00:00 committed by Git OBS Bridge
parent c921472ddf
commit c7efd6c62c

View File

@ -1,30 +0,0 @@
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index d75158e..0b0eaf5 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -130,6 +130,13 @@ static const struct {
},
};
+static int SUSE_allow_SSL3() {
+ if (getenv("OPENSSL_ALLOW_SSL3") != NULL)
+ return 1;
+
+ return 0;
+}
+
static int dane_ctx_enable(struct dane_ctx_st *dctx)
{
const EVP_MD **mdevp;
@@ -3049,6 +3056,11 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
ssl_ctx_system_config(ret);
+ /* Allow SSLv3 if user explicitly asked for it */
+ if (!SUSE_allow_SSL3()) {
+ ret->options |= SSL_OP_NO_SSLv3;
+ }
+
return ret;
err:
SSLerr(SSL_F_SSL_CTX_NEW, ERR_R_MALLOC_FAILURE);