From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 28 Nov 2023 23:28:10 +0000 (+1300)
Subject: lib:crypto: Add common out path to samba_gnutls_sp800_108_derive_key()
X-Git-Tag: talloc-2.4.2~450
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19f2365c6a0cbc07d9e2301c3ab205b00787830e;p=thirdparty%2Fsamba.git

lib:crypto: Add common out path to samba_gnutls_sp800_108_derive_key()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/crypto/gnutls_sp800_108.c b/lib/crypto/gnutls_sp800_108.c
index 5f3dbe39ab2..a67047bf423 100644
--- a/lib/crypto/gnutls_sp800_108.c
+++ b/lib/crypto/gnutls_sp800_108.c
@@ -120,7 +120,7 @@ NTSTATUS samba_gnutls_sp800_108_derive_key(
 	uint8_t digest[digest_len];
 	uint32_t i = 1;
 	uint32_t L = KO_len * 8;
-	NTSTATUS status;
+	NTSTATUS status = NT_STATUS_OK;
 	int rc;
 
 	if (KO_len > digest_len) {
@@ -159,12 +159,13 @@ NTSTATUS samba_gnutls_sp800_108_derive_key(
 							i,
 							digest);
 	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+		goto out;
 	}
 
 	memcpy(KO, digest, KO_len);
 
 	ZERO_ARRAY(digest);
 
-	return NT_STATUS_OK;
+out:
+	return status;
 }