From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Fri, 8 Sep 2023 20:13:22 +0000 (-0400)
Subject: Fix GNU TLS builds.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=facfa84444e910e48a4daefbcd060771ccc6e9bf;p=thirdparty%2Fcups.git

Fix GNU TLS builds.
---

diff --git a/cups/http-private.h b/cups/http-private.h
index e9b0200134..9ae86eb897 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -258,6 +258,7 @@ extern bool		_httpTLSStart(http_t *http) _CUPS_PRIVATE;
 extern void		_httpTLSStop(http_t *http) _CUPS_PRIVATE;
 extern int		_httpTLSWrite(http_t *http, const char *buf, int len) _CUPS_PRIVATE;
 extern int		_httpUpdate(http_t *http, http_status_t *status) _CUPS_PRIVATE;
+extern _http_tls_credentials_t *_httpUseCredentials(_http_tls_credentials_t *hcreds) _CUPS_PRIVATE;
 extern int		_httpWait(http_t *http, int msec, int usessl) _CUPS_PRIVATE;
 
 
diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index 16ed7551f3..b161bfea49 100644
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -1549,7 +1549,7 @@ _httpTLSStart(http_t *http)		// I - Connection to server
     }
 
     status      = gnutls_server_name_set(http->tls, GNUTLS_NAME_DNS, hostname, strlen(hostname));
-    credentials = _httpUseCredentials(cg->credentials);
+    credentials = _httpUseCredentials(cg->tls_credentials);
   }
   else
   {
@@ -2089,7 +2089,7 @@ gnutls_load_crl(void)
 	  }
 
 	  decoded = (size_t)(alloc_data - num_data);
-	  httpDecode64((char *)data + num_data, &decoded, line, NULL);
+	  httpDecode64_3((char *)data + num_data, &decoded, line, NULL);
 	  num_data += (size_t)decoded;
 	}
       }