From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 10 Feb 2020 08:54:48 +0000 (+0100)
Subject: base64_* -> kr_base64_*
X-Git-Tag: v5.1.0~49^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09a9cda678b97491dff5032f6ca32a8fec95ce2b;p=thirdparty%2Fknot-resolver.git

base64_* -> kr_base64_*

GnuTLS 3.3 contained these as public symbols.  This doesn't seem
important, but why not use more collision-resistant names anyway?
Details/discussion: https://github.com/CZ-NIC/knot/pull/14
Basically noone should notice, so I didn't include any NEWS entry.
---

diff --git a/contrib/base64.c b/contrib/base64.c
index f41db400a..b09319c20 100644
--- a/contrib/base64.c
+++ b/contrib/base64.c
@@ -81,7 +81,7 @@ static const uint8_t base64_dec[256] = {
 	[ 42] = KO, ['U'] = 20, [128] = KO, [171] = KO, [214] = KO,
 };
 
-int32_t base64_encode(const uint8_t  *in,
+int32_t kr_base64_encode(const uint8_t  *in,
                       const uint32_t in_len,
                       uint8_t        *out,
                       const uint32_t out_len)
@@ -129,7 +129,7 @@ int32_t base64_encode(const uint8_t  *in,
 	return (text - out);
 }
 
-int32_t base64_encode_alloc(const uint8_t  *in,
+int32_t kr_base64_encode_alloc(const uint8_t  *in,
                             const uint32_t in_len,
                             uint8_t        **out)
 {
@@ -151,7 +151,7 @@ int32_t base64_encode_alloc(const uint8_t  *in,
 	}
 
 	// Encode data.
-	int32_t ret = base64_encode(in, in_len, *out, out_len);
+	int32_t ret = kr_base64_encode(in, in_len, *out, out_len);
 	if (ret < 0) {
 		free(*out);
 	}
@@ -159,7 +159,7 @@ int32_t base64_encode_alloc(const uint8_t  *in,
 	return ret;
 }
 
-int32_t base64_decode(const uint8_t  *in,
+int32_t kr_base64_decode(const uint8_t  *in,
                       const uint32_t in_len,
                       uint8_t        *out,
                       const uint32_t out_len)
@@ -240,7 +240,7 @@ int32_t base64_decode(const uint8_t  *in,
 	return (bin - out);
 }
 
-int32_t base64_decode_alloc(const uint8_t  *in,
+int32_t kr_base64_decode_alloc(const uint8_t  *in,
                             const uint32_t in_len,
                             uint8_t        **out)
 {
@@ -259,7 +259,7 @@ int32_t base64_decode_alloc(const uint8_t  *in,
 	}
 
 	// Decode data.
-	int32_t ret = base64_decode(in, in_len, *out, out_len);
+	int32_t ret = kr_base64_decode(in, in_len, *out, out_len);
 	if (ret < 0) {
 		free(*out);
 	}
diff --git a/contrib/base64.h b/contrib/base64.h
index 0684274c6..c7619fc50 100644
--- a/contrib/base64.h
+++ b/contrib/base64.h
@@ -40,7 +40,7 @@
  * \retval >=0		length of output string.
  * \retval KNOT_E*	if error.
  */
-int32_t base64_encode(const uint8_t  *in,
+int32_t kr_base64_encode(const uint8_t  *in,
                       const uint32_t in_len,
                       uint8_t        *out,
                       const uint32_t out_len);
@@ -60,7 +60,7 @@ int32_t base64_encode(const uint8_t  *in,
  * \retval >=0		length of output string.
  * \retval KNOT_E*	if error.
  */
-int32_t base64_encode_alloc(const uint8_t  *in,
+int32_t kr_base64_encode_alloc(const uint8_t  *in,
                             const uint32_t in_len,
                             uint8_t        **out);
 
@@ -79,7 +79,7 @@ int32_t base64_encode_alloc(const uint8_t  *in,
  * \retval >=0		length of output data.
  * \retval KNOT_E*	if error.
  */
-int32_t base64_decode(const uint8_t  *in,
+int32_t kr_base64_decode(const uint8_t  *in,
                       const uint32_t in_len,
                       uint8_t        *out,
                       const uint32_t out_len);
@@ -100,7 +100,7 @@ int32_t base64_decode(const uint8_t  *in,
  * \retval >=0		length of output data.
  * \retval KNOT_E*	if error.
  */
-int32_t base64_decode_alloc(const uint8_t  *in,
+int32_t kr_base64_decode_alloc(const uint8_t  *in,
                             const uint32_t in_len,
                             uint8_t        **out);
 
diff --git a/daemon/bindings/net.c b/daemon/bindings/net.c
index a06858598..da987c40d 100644
--- a/daemon/bindings/net.c
+++ b/daemon/bindings/net.c
@@ -450,7 +450,7 @@ static int tls_params2lua(lua_State *L, trie_t *params)
 		lua_createtable(L, e->pins.len, 0);
 		for (size_t i = 0; i < e->pins.len; ++i) {
 			uint8_t pin_base64[TLS_SHA256_BASE64_BUFLEN];
-			int err = base64_encode(e->pins.at[i], TLS_SHA256_RAW_LEN,
+			int err = kr_base64_encode(e->pins.at[i], TLS_SHA256_RAW_LEN,
 						pin_base64, sizeof(pin_base64));
 			if (err < 0) {
 				assert(false);
@@ -593,7 +593,7 @@ static int net_tls_client(lua_State *L)
 				free(pin_raw);
 				ERROR("%s", kr_strerror(ENOMEM));
 			}
-			int ret = base64_decode((const uint8_t *)pin, strlen(pin),
+			int ret = kr_base64_decode((const uint8_t *)pin, strlen(pin),
 						pin_raw, TLS_SHA256_RAW_LEN + 8);
 			if (ret < 0) {
 				ERROR("not a valid pin_sha256: '%s' (length %d), %s\n",
diff --git a/daemon/tls.c b/daemon/tls.c
index f88267626..8778404e5 100644
--- a/daemon/tls.c
+++ b/daemon/tls.c
@@ -563,7 +563,7 @@ static int get_oob_key_pin(gnutls_x509_crt_t crt, char *outchar, ssize_t outchar
 	if (raw && outchar_len < TLS_SHA256_RAW_LEN) {
 		assert(false);
 		return kr_error(ENOSPC);
-		/* With !raw we have check inside base64_encode. */
+		/* With !raw we have check inside kr_base64_encode. */
 	}
 	gnutls_pubkey_t key;
 	int err = gnutls_pubkey_init(&key);
@@ -582,11 +582,11 @@ static int get_oob_key_pin(gnutls_x509_crt_t crt, char *outchar, ssize_t outchar
 	if (err != GNUTLS_E_SUCCESS || raw/*success*/)
 		goto leave;
 	/* Convert to non-raw. */
-	err = base64_encode((uint8_t *)raw_pin, sizeof(raw_pin),
+	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'; /* base64_encode() doesn't do it */
+		outchar[err] = '\0'; /* kr_base64_encode() doesn't do it */
 	} else if (err >= 0) {
 		assert(false);
 		err = kr_error(ENOSPC); /* base64 fits but '\0' doesn't */