summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
authorjsing <>2021-07-26 03:17:38 +0000
committerjsing <>2021-07-26 03:17:38 +0000
commitd07f7fde139d15ba9e55fcf7ecb45bbfc82d6564 (patch)
treed5c4303283f0e876353ed068b657a28628fa0880 /src/lib/libssl/s3_lib.c
parent33ebe6f37b9fdb4bc9eb04dfa95da59ed59d9427 (diff)
downloadopenbsd-d07f7fde139d15ba9e55fcf7ecb45bbfc82d6564.tar.gz
openbsd-d07f7fde139d15ba9e55fcf7ecb45bbfc82d6564.tar.bz2
openbsd-d07f7fde139d15ba9e55fcf7ecb45bbfc82d6564.zip
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@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c4
1 files changed, 2 insertions, 2 deletions
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 @@
1/* $OpenBSD: s3_lib.c,v 1.213 2021/07/03 16:06:44 jsing Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.214 2021/07/26 03:17:38 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2631,7 +2631,7 @@ ssl3_shutdown(SSL *s)
2631 return(-1); /* return WANT_WRITE */ 2631 return(-1); /* return WANT_WRITE */
2632 } else if (S3I(s)->alert_dispatch) { 2632 } else if (S3I(s)->alert_dispatch) {
2633 /* resend it if not sent */ 2633 /* resend it if not sent */
2634 ret = s->method->ssl_dispatch_alert(s); 2634 ret = ssl3_dispatch_alert(s);
2635 if (ret == -1) { 2635 if (ret == -1) {
2636 /* 2636 /*
2637 * We only get to return -1 here the 2nd/Nth 2637 * We only get to return -1 here the 2nd/Nth