From d07f7fde139d15ba9e55fcf7ecb45bbfc82d6564 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 26 Jul 2021 03:17:38 +0000
Subject: Dedup dtls1_dispatch_alert()/ssl3_dispatch_alert().

The code for dtls1_dispatch_alert() and ssl3_dispatch_alert() is largely
identical - with a bit of reshuffling we can use ssl3_dispatch_alert() for
both protocols and remove the ssl_dispatch_alert function pointer.

ok inoguchi@ tb@
---
 src/lib/libssl/s3_lib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/s3_lib.c')

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index b2d94629c2..6400454f1b 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.213 2021/07/03 16:06:44 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.214 2021/07/26 03:17:38 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2631,7 +2631,7 @@ ssl3_shutdown(SSL *s)
 			return(-1);	/* return WANT_WRITE */
 	} else if (S3I(s)->alert_dispatch) {
 		/* resend it if not sent */
-		ret = s->method->ssl_dispatch_alert(s);
+		ret = ssl3_dispatch_alert(s);
 		if (ret == -1) {
 			/*
 			 * We only get to return -1 here the 2nd/Nth
-- 
cgit v1.2.3-55-g6feb