From dca0076574e48f3c1e4a4c29eac91df16c97f5b8 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Tue, 8 Jun 2021 19:34:45 +0000 Subject: Simplify tlsext_ecpf_parse() The default alert in the tlsext parsing code is a decode_error, so there's no need for an error path that only sets that alert. suggested by/ok jsing --- lib/libssl/ssl_tlsext.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/libssl/ssl_tlsext.c b/lib/libssl/ssl_tlsext.c index bd707333628..8cc86d4649f 100644 --- a/lib/libssl/ssl_tlsext.c +++ b/lib/libssl/ssl_tlsext.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_tlsext.c,v 1.93 2021/06/08 17:22:00 tb Exp $ */ +/* $OpenBSD: ssl_tlsext.c,v 1.94 2021/06/08 19:34:44 tb Exp $ */ /* * Copyright (c) 2016, 2017, 2019 Joel Sing * Copyright (c) 2017 Doug Hogan @@ -353,11 +353,11 @@ tlsext_ecpf_parse(SSL *s, uint16_t msg_type, CBS *cbs, int *alert) CBS ecpf; if (!CBS_get_u8_length_prefixed(cbs, &ecpf)) - goto err; + return 0; if (CBS_len(&ecpf) == 0) - goto err; + return 0; if (CBS_len(cbs) != 0) - goto err; + return 0; /* Must contain uncompressed (0) - RFC 8422, section 5.1.2. */ if (!CBS_contains_zero_byte(&ecpf)) { @@ -375,10 +375,6 @@ tlsext_ecpf_parse(SSL *s, uint16_t msg_type, CBS *cbs, int *alert) } return 1; - - err: - *alert = SSL_AD_DECODE_ERROR; - return 0; } int -- cgit v1.2.3