diff -Nru ruby-eventmachine-1.0.7/debian/changelog ruby-eventmachine-1.0.7/debian/changelog --- ruby-eventmachine-1.0.7/debian/changelog 2018-12-02 12:44:21.000000000 +0000 +++ ruby-eventmachine-1.0.7/debian/changelog 2018-12-05 12:54:17.000000000 +0000 @@ -1,3 +1,13 @@ +ruby-eventmachine (1.0.7-4.1ubuntu1) disco; urgency=medium + + * Non-maintainer upload. + * Revert below upload and build with OpenSSL 1.1+. + * Add a patch to clamp SSL version to TLS1.2, and allow using small + keys, as the rest of the codebase is not ready for TLS1.3. (Closes: + #900160) + + -- Dimitri John Ledkov Wed, 05 Dec 2018 12:54:17 +0000 + ruby-eventmachine (1.0.7-4.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru ruby-eventmachine-1.0.7/debian/control ruby-eventmachine-1.0.7/debian/control --- ruby-eventmachine-1.0.7/debian/control 2018-12-02 12:31:53.000000000 +0000 +++ ruby-eventmachine-1.0.7/debian/control 2018-12-05 12:54:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: ruby-eventmachine Section: ruby Priority: optional -Maintainer: Debian Ruby Extras Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Ruby Extras Maintainers Uploaders: Daigo Moriwaki , Ryan Niebur , Laurent Arnoud , @@ -9,7 +10,7 @@ Per Andersson Build-Depends: debhelper (>= 9~), gem2deb, - libssl1.0-dev, + libssl-dev, rake, ruby-test-unit Standards-Version: 3.9.8 diff -Nru ruby-eventmachine-1.0.7/debian/patches/max-tls1.2.patch ruby-eventmachine-1.0.7/debian/patches/max-tls1.2.patch --- ruby-eventmachine-1.0.7/debian/patches/max-tls1.2.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-eventmachine-1.0.7/debian/patches/max-tls1.2.patch 2018-12-05 12:54:17.000000000 +0000 @@ -0,0 +1,16 @@ +Description: clamp SSL to TLS1.2, and allow small keys. +Author: Dimitri John Ledkov + +Index: ruby-eventmachine-1.0.7/ext/ssl.cpp +=================================================================== +--- ruby-eventmachine-1.0.7.orig/ext/ssl.cpp ++++ ruby-eventmachine-1.0.7/ext/ssl.cpp +@@ -151,6 +151,8 @@ SslContext_t::SslContext_t (bool is_serv + + SSL_CTX_set_options (pCtx, SSL_OP_ALL); + //SSL_CTX_set_options (pCtx, (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3)); ++ SSL_CTX_set_max_proto_version(pCtx, TLS1_2_VERSION); ++ SSL_CTX_set_security_level(pCtx, 0); + #ifdef SSL_MODE_RELEASE_BUFFERS + SSL_CTX_set_mode (pCtx, SSL_MODE_RELEASE_BUFFERS); + #endif diff -Nru ruby-eventmachine-1.0.7/debian/patches/series ruby-eventmachine-1.0.7/debian/patches/series --- ruby-eventmachine-1.0.7/debian/patches/series 2018-12-02 12:43:05.000000000 +0000 +++ ruby-eventmachine-1.0.7/debian/patches/series 2018-12-05 12:54:17.000000000 +0000 @@ -1,3 +1,4 @@ skip_tests_using_network.patch disable_broken_patch_upstream_issue_575 disable-inotify-test +max-tls1.2.patch