NixOS · Apr 22, 2020 · Apr 22, 2020 · Apr 23, 2020 · Apr 23, 2020 · Apr 25, 2020
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = pname;
-    rev = "74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af"; # patches of tip from gnome-3-28 branch
-    sha256 = "0gw1n1w3i040w5mv30kkg7g8a59ymjlc5yaklip0ngg8xv76g0zi";
+    rev = "88e855bf0a5646fdd85a838bfb433451c42513d7"; # patches of tip from gnome-3-28 branch
+    sha256 = "19k99qkjhk3r8rwa1v6wl0frm1wd95iasqmrb9sadyri0mkwxvg4";
   };
 
   patches = [

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -62,6 +62,17 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
       sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
     })
+
+    # Fix backported for desktop freezing after ~50 days idle
+    # https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/002299fbef2fd99fb36e5b881ed7b4095ff481f6.patch";
+      sha256 = "0x3kk75rqmcsyzhmhxjnh8n8ng4zyrbmh0yzvc79zcphzmdckavb";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/c2e12b3434967e520dcda76bf1d562676e8961ff.patch";
+      sha256 = "0l3ckmskxmisbjdhpr30yc2hclyc4l2f0jsgzisnq5aiszy9q0i0";
+    })
   ];
 
   postPatch = ''

diff --git a/pkgs/development/libraries/openssl/1.1/cve-2020-1967-test.patch b/pkgs/development/libraries/openssl/1.1/cve-2020-1967-test.patch
@@ -0,0 +1,114 @@
+From: Benjamin Kaduk <kaduk@mit.edu>
+Date: Fri, 10 Apr 2020 12:27:28 -0700
+Subject: Add test for CVE-2020-1967
+
+Add to test_sslsigalgs a TLSProxy test that injects a
+"signature_algorithms_cert" extension that contains an unallocated
+codepoint.
+
+The test currently fails, since s_server segfaults instead of
+ignoring the unrecognized value.
+
+Since "signature_algorithms" and "signature_algorithms_cert" are very
+similar, also add the analogous test for "signature_algorithms".
+
+[bigeasy: + 2x "fixup! Add test for CVE-2020-1967"]
+---
+ test/recipes/70-test_sslsigalgs.t | 66 +++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 64 insertions(+), 2 deletions(-)
+
+diff --git a/test/recipes/70-test_sslsigalgs.t b/test/recipes/70-test_sslsigalgs.t
+index f805dcf221e8..9fadefdee62d 100644
+--- a/test/recipes/70-test_sslsigalgs.t
++++ b/test/recipes/70-test_sslsigalgs.t
+@@ -44,7 +44,9 @@ use constant {
+     COMPAT_SIGALGS => 6,
+     SIGALGS_CERT_ALL => 7,
+     SIGALGS_CERT_PKCS => 8,
+-    SIGALGS_CERT_INVALID => 9
++    SIGALGS_CERT_INVALID => 9,
++    UNRECOGNIZED_SIGALGS_CERT => 10,
++    UNRECOGNIZED_SIGALG => 11
+ };
+
+ #Note: Throughout this test we override the default ciphersuites where TLSv1.2
+@@ -53,7 +55,7 @@ use constant {
+
+ #Test 1: Default sig algs should succeed
+ $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
+-plan tests => 22;
++plan tests => 24;
+ ok(TLSProxy::Message->success, "Default sigalgs");
+ my $testtype;
+
+@@ -261,6 +263,39 @@ SKIP: {
+     ok(TLSProxy::Message->fail, "No matching certificate for sigalgs_cert");
+ }
+
++SKIP: {
++    skip "TLS 1.3 disabled", 2 if disabled("tls1_3");
++    #Test 23: Send an unrecognized signature_algorithms_cert
++    #        We should be able to skip over the unrecognized value and use a
++    #        valid one that appears later in the list.
++    $proxy->clear();
++    $proxy->filter(\&inject_unrecognized_sigalg);
++    $proxy->clientflags("-tls1_3");
++    # Use -xcert to get SSL_check_chain() to run in the cert_cb.  This is
++    # needed to trigger (e.g.) CVE-2020-1967
++    $proxy->serverflags("" .
++            " -xcert " . srctop_file("test", "certs", "servercert.pem") .
++            " -xkey " . srctop_file("test", "certs", "serverkey.pem") .
++            " -xchain " . srctop_file("test", "certs", "rootcert.pem"));
++    $testtype = UNRECOGNIZED_SIGALGS_CERT;
++    $proxy->start();
++    ok(TLSProxy::Message->success(), "Unrecognized sigalg_cert in ClientHello");
++
++    #Test 24: Send an unrecognized signature_algorithms
++    #        We should be able to skip over the unrecognized value and use a
++    #        valid one that appears later in the list.
++    $proxy->clear();
++    $proxy->filter(\&inject_unrecognized_sigalg);
++    $proxy->clientflags("-tls1_3");
++    $proxy->serverflags("" .
++            " -xcert " . srctop_file("test", "certs", "servercert.pem") .
++            " -xkey " . srctop_file("test", "certs", "serverkey.pem") .
++            " -xchain " . srctop_file("test", "certs", "rootcert.pem"));
++    $testtype = UNRECOGNIZED_SIGALG;
++    $proxy->start();
++    ok(TLSProxy::Message->success(), "Unrecognized sigalg in ClientHello");
++}
++
+
+
+ sub sigalgs_filter
+@@ -406,3 +441,30 @@ sub modify_cert_verify_sigalg
+         }
+     }
+ }
++
++sub inject_unrecognized_sigalg
++{
++    my $proxy = shift;
++    my $type;
++
++    # We're only interested in the initial ClientHello
++    if ($proxy->flight != 0) {
++        return;
++    }
++    if ($testtype == UNRECOGNIZED_SIGALGS_CERT) {
++        $type = TLSProxy::Message::EXT_SIG_ALGS_CERT;
++    } elsif ($testtype == UNRECOGNIZED_SIGALG) {
++        $type = TLSProxy::Message::EXT_SIG_ALGS;
++    } else {
++        return;
++    }
++
++    my $ext = pack "C8",
++        0x00, 0x06, #Extension length
++        0xfe, 0x18, #private use
++        0x04, 0x01, #rsa_pkcs1_sha256
++        0x08, 0x04; #rsa_pss_rsae_sha256;
++    my $message = ${$proxy->message_list}[0];
++    $message->set_extension($type, $ext);
++    $message->repack;
++}
diff --git a/pkgs/development/libraries/openssl/1.1/cve-2020-1967.patch b/pkgs/development/libraries/openssl/1.1/cve-2020-1967.patch
@@ -0,0 +1,42 @@
+From: Benjamin Kaduk <kaduk@mit.edu>
+Date: Fri, 10 Apr 2020 12:27:28 -0700
+Subject: Fix NULL dereference in SSL_check_chain() for TLS 1.3
+
+In the tls1_check_sig_alg() helper function, we loop through the list of
+"signature_algorithms_cert" values received from the client and attempt
+to look up each one in turn in our internal table that maps wire
+codepoint to string-form name, digest and/or signature NID, etc., in
+order to compare the signature scheme from the peer's list against what
+is used to sign the certificates in the certificate chain we're
+checking.  Unfortunately, when the peer sends a value that we don't
+support, the lookup returns NULL, but we unconditionally dereference the
+lookup result for the comparison, leading to an application crash
+triggerable by an unauthenticated client.
+
+Since we will not be able to say anything about algorithms we don't
+recognize, treat NULL return from lookup as "does not match".
+
+We currently only apply the "signature_algorithm_cert" checks on TLS 1.3
+connections, so previous TLS versions are unaffected.  SSL_check_chain()
+is not called directly from libssl, but may be used by the application
+inside a callback (e.g., client_hello or cert callback) to verify that a
+candidate certificate chain will be acceptable to the client.
+
+CVE-2020-1967
+---
+ ssl/t1_lib.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
+index b482019c4c17..5287d10a2d0a 100644
+--- a/ssl/t1_lib.c
++++ b/ssl/t1_lib.c
+@@ -2099,7 +2099,7 @@ static int tls1_check_sig_alg(SSL *s, X509 *x, int default_nid)
+         sigalg = use_pc_sigalgs
+                  ? tls1_lookup_sigalg(s->s3->tmp.peer_cert_sigalgs[i])
+                  : s->shared_sigalgs[i];
+-        if (sig_nid == sigalg->sigandhash)
++        if (sigalg != NULL && sig_nid == sigalg->sigandhash)
+             return 1;
+     }
+     return 0;
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
@@ -154,6 +154,10 @@ in {
 
       ./1.1/cve-2019-1551.patch
       ./1.1/cve-2019-1551-improve.patch
+
+      ./1.1/cve-2020-1967.patch
+      ./1.1/cve-2020-1967-test.patch
+
     ];
     withDocs = true;
   };