From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 28 Aug 2024 10:48:40 +0000 (+0200)
Subject: daemon/tls: fix a bug that caused empty base64 pins
X-Git-Tag: v6.0.9~24^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dac7949dfe14737d9439780a127a2fc94f0bc96c;p=thirdparty%2Fknot-resolver.git

daemon/tls: fix a bug that caused empty base64 pins
---

diff --git a/daemon/tls.c b/daemon/tls.c
index 2b8eb99a8..b682285a2 100644
--- a/daemon/tls.c
+++ b/daemon/tls.c
@@ -384,11 +384,11 @@ static int get_oob_key_pin(gnutls_x509_crt_t crt, char *outchar, ssize_t outchar
 	err = kr_base64_encode((uint8_t *)raw_pin, sizeof(raw_pin),
 			    (uint8_t *)outchar, outchar_len);
 	if (err >= 0 && err < outchar_len) {
-		err = GNUTLS_E_SUCCESS;
 		outchar[err] = '\0'; /* kr_base64_encode() doesn't do it */
+		err = GNUTLS_E_SUCCESS;
 	} else if (kr_fails_assert(err < 0)) {
-		err = kr_error(ENOSPC); /* base64 fits but '\0' doesn't */
 		outchar[outchar_len - 1] = '\0';
+		err = kr_error(ENOSPC); /* base64 fits but '\0' doesn't */
 	}
 leave:
 	gnutls_free(datum.data);