From e9bbefbf0f24c57645e7ad6a5a71ae649d18ac8e Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Fri, 14 Dec 2018 07:28:30 +0000
Subject: [PATCH] Go into the error state if a fatal alert is sent or received

If an application calls SSL_shutdown after a fatal alert has occured and
then behaves different based on error codes from that function then the
application may be vulnerable to a padding oracle.

CVE-2019-1559

Reviewed-by: Richard Levitte <levitte@openssl.org>
---
 ssl/d1_pkt.c |  1 +
 ssl/s3_pkt.c | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 23aa9db..c7fe977 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1309,6 +1309,7 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             ERR_add_error_data(2, "SSL alert number ", tmp);
             s->shutdown |= SSL_RECEIVED_SHUTDOWN;
             SSL_CTX_remove_session(s->session_ctx, s->session);
+            s->state = SSL_ST_ERR;
             return (0);
         } else {
             al = SSL_AD_ILLEGAL_PARAMETER;
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 6527df8..830b723 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1500,6 +1500,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             ERR_add_error_data(2, "SSL alert number ", tmp);
             s->shutdown |= SSL_RECEIVED_SHUTDOWN;
             SSL_CTX_remove_session(s->session_ctx, s->session);
+            s->state = SSL_ST_ERR;
             return (0);
         } else {
             al = SSL_AD_ILLEGAL_PARAMETER;
@@ -1719,9 +1720,12 @@ int ssl3_send_alert(SSL *s, int level, int desc)
                                           * protocol_version alerts */
     if (desc < 0)
         return -1;
-    /* If a fatal one, remove from cache */
-    if ((level == 2) && (s->session != NULL))
-        SSL_CTX_remove_session(s->session_ctx, s->session);
+    /* If a fatal one, remove from cache and go into the error state */
+    if (level == SSL3_AL_FATAL) {
+        if (s->session != NULL)
+            SSL_CTX_remove_session(s->session_ctx, s->session);
+        s->state = SSL_ST_ERR;
+    }
 
     s->s3->alert_dispatch = 1;
     s->s3->send_alert[0] = level;
-- 
2.7.4

m?id=94ca5b4357af8f8921f0cb0873a7cf316f13aa69'>time-travel-manifest.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/time-travel-manifest.scm?id=94ca5b4357af8f8921f0cb0873a7cf316f13aa69&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-08-17 15:42:56 +0200'>2022-08-17</span></td><td><a href='/guix/commit/etc/time-travel-manifest.scm?id=845c841e21379e64a4215ee6d3d60da343e7fb93'>time-travel-manifest: Use a separate cache per system.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/time-travel-manifest.scm (&lt;guix-instance-compiler&gt;): Use a separate
cache per system so that parallel system evaluations do no step on each
other's toes.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2022-07-10 23:57:14 +0200'>2022-07-10</span></td><td><a href='/guix/commit/etc/time-travel-manifest.scm?id=5d0437ea8ce0147b47b9df866fa2413b48f71a1a'>time-travel-manifest: Use a separate Git checkout cache.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/time-travel-manifest.scm (guix-instance-compiler): Parameterize
%REPOSITORY-CACHE-DIRECTORY.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-07-08 23:58:11 +0200'>2022-07-08</span></td><td><a href='/guix/commit/etc/time-travel-manifest.scm?id=e80f0cda96181d90604c44f69094f2499036b3f6'>etc: Add 'time-travel-manifest.scm'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This manifest makes it easy to test travels from the current revision
back to the revision of a past Guix release.

Suggested by zimoun &lt;zimon.toutoune@gmail.com&gt;.

* etc/time-travel-manifest.scm: New file.
* Makefile.am (EXTRA_DIST): Add it.
</span></span></td><td>Ludovic Courtès</td></tr>