From 4e37dd6c60e60dd377d3fe66ceb8e537f1660abb Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 22 Jun 2015 00:38:02 +0300 Subject: [PATCH] SAE: Simplify sae_prepare_commit() error path There is no need to keep separate "return -1" statements for these error cases. Signed-off-by: Jouni Malinen --- src/common/sae.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/common/sae.c b/src/common/sae.c index 588895808..ae200f3e0 100644 --- a/src/common/sae.c +++ b/src/common/sae.c @@ -506,15 +506,12 @@ int sae_prepare_commit(const u8 *addr1, const u8 *addr2, const u8 *password, size_t password_len, struct sae_data *sae) { - if (sae->tmp == NULL) - return -1; - if (sae->tmp->ec && sae_derive_pwe_ecc(sae, addr1, addr2, password, - password_len) < 0) - return -1; - if (sae->tmp->dh && sae_derive_pwe_ffc(sae, addr1, addr2, password, - password_len) < 0) - return -1; - if (sae_derive_commit(sae) < 0) + if (sae->tmp == NULL || + (sae->tmp->ec && sae_derive_pwe_ecc(sae, addr1, addr2, password, + password_len) < 0) || + (sae->tmp->dh && sae_derive_pwe_ffc(sae, addr1, addr2, password, + password_len) < 0) || + sae_derive_commit(sae) < 0) return -1; return 0; }