Fix GNU TLS builds.

diff --git a/cups/http-private.h b/cups/http-private.h
index e9b02001344e9b5682d751386db8295b0212235d..9ae86eb8973736d668ece5e458ee59b66bd40386 100644 (file)
--- 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 16ed7551f3c39c023a9d3d765f2857545eef1a70..b161bfea49ebfef813f60dab2bed8533cae858d8 100644 (file)
--- 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;
        }
       }