]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Fix build error with GNU TLS (deprecated types)
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 27 May 2014 15:10:09 +0000 (15:10 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 27 May 2014 15:10:09 +0000 (15:10 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11899 a1ca3aef-8c08-0410-bb20-df032aa958be

scheduler/tls-gnutls.c

index 36518cd0ecabfc3fea55e4c372833a8d6fd2f032..1a18919a24ec3d380f1f70e03d273f38adbcc2b9 100644 (file)
@@ -117,7 +117,7 @@ cupsdStartTLS(cupsd_client_t *con)  /* I - Client connection */
   gnutls_set_default_priority(con->http.tls);
 
   gnutls_credentials_set(con->http.tls, GNUTLS_CRD_CERTIFICATE, *credentials);
-  gnutls_transport_set_ptr(con->http.tls, (gnutls_transport_ptr)HTTP(con));
+  gnutls_transport_set_ptr(con->http.tls, (gnutls_transport_ptr_t)HTTP(con));
   gnutls_transport_set_pull_function(con->http.tls, _httpReadGNUTLS);
   gnutls_transport_set_push_function(con->http.tls, _httpWriteGNUTLS);
 
@@ -152,8 +152,8 @@ cupsdStartTLS(cupsd_client_t *con)  /* I - Client connection */
 static int                             /* O - 1 on success, 0 on failure */
 make_certificate(cupsd_client_t *con)  /* I - Client connection */
 {
-  gnutls_x509_crt      crt;            /* Self-signed certificate */
-  gnutls_x509_privkey  key;            /* Encryption key */
+  gnutls_x509_crt_t    crt;            /* Self-signed certificate */
+  gnutls_x509_privkey_t        key;            /* Encryption key */
   cups_lang_t          *language;      /* Default language info */
   cups_file_t          *fp;            /* Key/cert file */
   unsigned char                buffer[8192];   /* Buffer for x509 data */