SSL_CTX_remove_session() checks for a NULL session, avoid doing it twice.

jsing · jsing · commit 9ec68d9f1774 · 2021-08-04T12:41:25.000Z
Noted by tb@ during review of a larger change.
diff --git a/src/lib/libssl/ssl_pkt.c b/src/lib/libssl/ssl_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_pkt.c,v 1.47 2021/07/31 09:31:04 jsing Exp $ */
+/* $OpenBSD: ssl_pkt.c,v 1.48 2021/08/04 12:41:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1204,7 +1204,7 @@ int
 ssl3_send_alert(SSL *s, int level, int desc)
 {
 	/* If a fatal one, remove from cache */
-	if ((level == SSL3_AL_FATAL) && (s->session != NULL))
+	if (level == SSL3_AL_FATAL)
 		SSL_CTX_remove_session(s->ctx, s->session);
 
 	S3I(s)->alert_dispatch = 1;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $OpenBSD: ssl_pkt.c,v 1.47 2021/07/31 09:31:04 jsing Exp $ */`
	`1`	`+/* $OpenBSD: ssl_pkt.c,v 1.48 2021/08/04 12:41:25 jsing Exp $ */`
`2`	`2`	`/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)`
`3`	`3`	`* All rights reserved.`
`4`	`4`	`*`
`@@ -1204,7 +1204,7 @@ int`
`1204`	`1204`	`ssl3_send_alert(SSL *s, int level, int desc)`
`1205`	`1205`	`{`
`1206`	`1206`	`/* If a fatal one, remove from cache */`
`1207`		`- if ((level == SSL3_AL_FATAL) && (s->session != NULL))`
	`1207`	`+ if (level == SSL3_AL_FATAL)`
`1208`	`1208`	`SSL_CTX_remove_session(s->ctx, s->session);`
`1209`	`1209`
`1210`	`1210`	`S3I(s)->alert_dispatch = 1;`