From 68d7a0a5dccfe399302089845867ae551f67ad13 Mon Sep 17 00:00:00 2001 From: tb Date: Thu, 7 Jul 2022 17:08:28 +0000 Subject: [PATCH] Use a local bits variable to avoid ugly line break due to nested function calls. ok jsing --- lib/libssl/ssl_seclevel.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/libssl/ssl_seclevel.c b/lib/libssl/ssl_seclevel.c index b9c724e262b..4ccd9576899 100644 --- a/lib/libssl/ssl_seclevel.c +++ b/lib/libssl/ssl_seclevel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_seclevel.c,v 1.21 2022/07/07 13:04:39 tb Exp $ */ +/* $OpenBSD: ssl_seclevel.c,v 1.22 2022/07/07 17:08:28 tb Exp $ */ /* * Copyright (c) 2020 Theo Buehler * @@ -229,8 +229,11 @@ ssl_security(const SSL *ssl, int secop, int bits, int nid, void *other) int ssl_security_sigalg_check(const SSL *ssl, const EVP_PKEY *pkey) { - return ssl_security(ssl, SSL_SECOP_SIGALG_CHECK, - EVP_PKEY_security_bits(pkey), 0, NULL); + int bits; + + bits = EVP_PKEY_security_bits(pkey); + + return ssl_security(ssl, SSL_SECOP_SIGALG_CHECK, bits, 0, NULL); } int @@ -272,14 +275,21 @@ ssl_security_supported_cipher(const SSL *ssl, SSL_CIPHER *cipher) int ssl_ctx_security_dh(const SSL_CTX *ctx, DH *dh) { - return ssl_ctx_security(ctx, SSL_SECOP_TMP_DH, DH_security_bits(dh), 0, - dh); + int bits; + + bits = DH_security_bits(dh); + + return ssl_ctx_security(ctx, SSL_SECOP_TMP_DH, bits, 0, dh); } int ssl_security_dh(const SSL *ssl, DH *dh) { - return ssl_security(ssl, SSL_SECOP_TMP_DH, DH_security_bits(dh), 0, dh); + int bits; + + bits = DH_security_bits(dh); + + return ssl_security(ssl, SSL_SECOP_TMP_DH, bits, 0, dh); } static int -- 2.20.1