Fix some style issues with TLSv1.3 state machine PR Reviewed-by: Rich Salz <rsalz@openssl.org>
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index ec1a1de..1f4e630 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c
@@ -2190,9 +2190,8 @@ /* * Perform miscellaneous checks and processing after we have received the * server's initial flight. In TLS1.3 this is after the Server Finished message. - * In <=TLS1.2 this is after the ServerDone message. - * - * Returns 1 on success or 0 on failure. + * In <=TLS1.2 this is after the ServerDone message. Returns 1 on success or 0 + * on failure. */ int tls_process_initial_server_flight(SSL *s, int *al) {
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index adee7a0..f8ccdec 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c
@@ -293,6 +293,7 @@ size_t ivlen, keylen, finsecretlen; const unsigned char *label; size_t labellen; + int ret = 0; if (which & SSL3_CC_READ) { if (s->enc_read_ctx != NULL) { @@ -427,14 +428,11 @@ } #endif - OPENSSL_cleanse(secret, sizeof(secret)); - OPENSSL_cleanse(key, sizeof(key)); - OPENSSL_cleanse(iv, sizeof(iv)); - return 1; + ret = 1; err: OPENSSL_cleanse(secret, sizeof(secret)); OPENSSL_cleanse(key, sizeof(key)); OPENSSL_cleanse(iv, sizeof(iv)); - return 0; + return ret; }