summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-01-24 13:53:29 +0000
committertb <>2022-01-24 13:53:29 +0000
commit9671f2cab1da37a774b99b19d8d783ed36094a95 (patch)
treec8bb67b3b12f178b8cb52c2abfcc0d8dd2769a11 /src
parentac63f756e81606d450586281c14ce0c8cd70790c (diff)
downloadopenbsd-9671f2cab1da37a774b99b19d8d783ed36094a95.tar.gz
openbsd-9671f2cab1da37a774b99b19d8d783ed36094a95.tar.bz2
openbsd-9671f2cab1da37a774b99b19d8d783ed36094a95.zip
Garbage collect unused ret in ssl3_get_new_session_ticket()
ret is used to bubble up an error from ssl3_get_message() and is unused otherwise. Zap dead store and silly ret = 1; return ret; ok inoguchi jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_clnt.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 7e4ef44b9c..a402535c7d 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.138 2022/01/24 13:51:48 tb Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.139 2022/01/24 13:53:29 tb 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 *
@@ -1602,8 +1602,6 @@ ssl3_get_new_session_ticket(SSL *s)
1602 SSL3_ST_CR_SESSION_TICKET_B, -1, 16384)) <= 0) 1602 SSL3_ST_CR_SESSION_TICKET_B, -1, 16384)) <= 0)
1603 return ret; 1603 return ret;
1604 1604
1605 ret = 0;
1606
1607 if (S3I(s)->hs.tls12.message_type == SSL3_MT_FINISHED) { 1605 if (S3I(s)->hs.tls12.message_type == SSL3_MT_FINISHED) {
1608 S3I(s)->hs.tls12.reuse_message = 1; 1606 S3I(s)->hs.tls12.reuse_message = 1;
1609 return (1); 1607 return (1);
@@ -1655,8 +1653,9 @@ ssl3_get_new_session_ticket(SSL *s)
1655 EVP_Digest(CBS_data(&session_ticket), CBS_len(&session_ticket), 1653 EVP_Digest(CBS_data(&session_ticket), CBS_len(&session_ticket),
1656 s->session->session_id, &s->session->session_id_length, 1654 s->session->session_id, &s->session->session_id_length,
1657 EVP_sha256(), NULL); 1655 EVP_sha256(), NULL);
1658 ret = 1; 1656
1659 return (ret); 1657 return (1);
1658
1660 fatal_err: 1659 fatal_err:
1661 ssl3_send_alert(s, SSL3_AL_FATAL, al); 1660 ssl3_send_alert(s, SSL3_AL_FATAL, al);
1662 err: 1661 err: