[SCM] GNU shishi branch, master, updated. shishi-1-0-2-39-g9771ff7

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=9771ff753aa23f70e9d4a7297b8a86494b366d36

The branch, master has been updated
       via  9771ff753aa23f70e9d4a7297b8a86494b366d36 (commit)
      from  67f0134780d458a69d070788b00838c6a3e600d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9771ff753aa23f70e9d4a7297b8a86494b366d36
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Jul 5 03:15:20 2014 +0200

    Adapt to libgnutls28.
    
    Avoid depreciated typedefs used by older versions
    of libgnutls. Add elliptic key exchange ANON-ECDH
    to the priority list.

-----------------------------------------------------------------------

Summary of changes:
 lib/starttls.c |   12 ++++++------
 src/kdc.h      |   14 +++++++-------
 src/resume.c   |   10 +++++-----
 src/shishid.c  |    6 +++---
 src/starttls.c |   14 +++++++-------
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lib/starttls.c b/lib/starttls.c
index b8f27c0..13a427c 100644
--- a/lib/starttls.c
+++ b/lib/starttls.c
@@ -85,7 +85,7 @@ _shishi_tls_done (Shishi * handle)
 static int
 _shishi_sendrecv_tls1 (Shishi * handle,
                       int sockfd,
-                      gnutls_session session,
+                      gnutls_session_t session,
                       const char *indata, size_t inlen,
                       char **outdata, size_t * outlen,
                       size_t timeout, bool have_cas)
@@ -107,7 +107,7 @@ _shishi_sendrecv_tls1 (Shishi * handle,
       memcmp (extbuf, STARTTLS_SERVER_ACCEPT, STARTTLS_LEN) != 0)
     return SHISHI_RECVFROM_ERROR;
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr)
+  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t)
                            (unsigned long) sockfd);
 
   if (session_data_size > 0)
@@ -231,9 +231,9 @@ _shishi_sendrecv_tls (Shishi * handle,
                      const char *indata, size_t inlen,
                      char **outdata, size_t * outlen)
 {
-  gnutls_session session;
-  gnutls_anon_client_credentials anoncred;
-  gnutls_certificate_credentials x509cred;
+  gnutls_session_t session;
+  gnutls_anon_client_credentials_t anoncred;
+  gnutls_certificate_credentials_t x509cred;
   int sockfd;
   int ret, outerr;
   const char *cafile = shishi_x509ca_default_file (handle);
@@ -263,7 +263,7 @@ _shishi_sendrecv_tls (Shishi * handle,
       return SHISHI_CRYPTO_ERROR;
     }
 
-  ret = gnutls_priority_set_direct (session, "NORMAL:+ANON-DH", NULL);
+  ret = gnutls_priority_set_direct (session, "NORMAL:+ANON-ECDH:+ANON-DH", 
NULL);
   if (ret != GNUTLS_E_SUCCESS)
     {
       shishi_error_printf (handle, "TLS psd failed (%d): %s",
diff --git a/src/kdc.h b/src/kdc.h
index 4f28988..9272140 100644
--- a/src/kdc.h
+++ b/src/kdc.h
@@ -116,7 +116,7 @@ struct listenspec
   size_t bufpos;
   int usetls;
 #ifdef USE_STARTTLS
-  gnutls_session session;
+  gnutls_session_t session;
 #endif
   struct listenspec *next;
 };
@@ -130,9 +130,9 @@ extern size_t fatal_krberror_len;
 
 #ifdef USE_STARTTLS
 #define DH_BITS 1024
-extern gnutls_dh_params dh_params;
-extern gnutls_anon_server_credentials anoncred;
-extern gnutls_certificate_credentials x509cred;
+extern gnutls_dh_params_t dh_params;
+extern gnutls_anon_server_credentials_t anoncred;
+extern gnutls_certificate_credentials_t x509cred;
 #endif
 
 /* Interface between shishid.c and server.c. */
@@ -150,7 +150,7 @@ extern int kdc_extension (struct listenspec *ls);
 #ifdef USE_STARTTLS
 extern void resume_db_init (size_t nconnections);
 extern void resume_db_done (void);
-extern int resume_db_store (void *dbf, gnutls_datum key, gnutls_datum data);
-extern gnutls_datum resume_db_fetch (void *dbf, gnutls_datum key);
-extern int resume_db_delete (void *dbf, gnutls_datum key);
+extern int resume_db_store (void *dbf, gnutls_datum_t key, gnutls_datum_t 
data);
+extern gnutls_datum_t resume_db_fetch (void *dbf, gnutls_datum_t key);
+extern int resume_db_delete (void *dbf, gnutls_datum_t key);
 #endif
diff --git a/src/resume.c b/src/resume.c
index e7e9483..361a9f2 100644
--- a/src/resume.c
+++ b/src/resume.c
@@ -38,7 +38,7 @@ static size_t cache_db_ptr = 0;
 static size_t cache_db_size = 0;
 
 int
-resume_db_store (void *dbf, gnutls_datum key, gnutls_datum data)
+resume_db_store (void *dbf, gnutls_datum_t key, gnutls_datum_t data)
 {
   if (cache_db_size == 0)
     return -1;
@@ -58,10 +58,10 @@ resume_db_store (void *dbf, gnutls_datum key, gnutls_datum 
data)
   return 0;
 }
 
-gnutls_datum
-resume_db_fetch (void *dbf, gnutls_datum key)
+gnutls_datum_t
+resume_db_fetch (void *dbf, gnutls_datum_t key)
 {
-  gnutls_datum res = { NULL, 0 };
+  gnutls_datum_t res = { NULL, 0 };
   size_t i;
 
   for (i = 0; i < cache_db_size; i++)
@@ -83,7 +83,7 @@ resume_db_fetch (void *dbf, gnutls_datum key)
 }
 
 int
-resume_db_delete (void *dbf, gnutls_datum key)
+resume_db_delete (void *dbf, gnutls_datum_t key)
 {
   size_t i;
 
diff --git a/src/shishid.c b/src/shishid.c
index 14bccfb..b909e31 100644
--- a/src/shishid.c
+++ b/src/shishid.c
@@ -36,9 +36,9 @@ struct listenspec *listenspec;
 char *fatal_krberror;
 size_t fatal_krberror_len;
 #ifdef USE_STARTTLS
-gnutls_dh_params dh_params;
-gnutls_anon_server_credentials anoncred;
-gnutls_certificate_credentials x509cred;
+gnutls_dh_params_t dh_params;
+gnutls_anon_server_credentials_t anoncred;
+gnutls_certificate_credentials_t x509cred;
 #endif
 
 /* Listen to all listenspec's, removing entries that fail. */
diff --git a/src/starttls.c b/src/starttls.c
index c7ae931..2436e1c 100644
--- a/src/starttls.c
+++ b/src/starttls.c
@@ -28,12 +28,12 @@
 /* This function will print information about this session's peer
  * certificate. */
 static void
-logcertinfo (gnutls_session session)
+logcertinfo (gnutls_session_t session)
 {
   time_t now = time (NULL);
-  const gnutls_datum *cert_list;
+  const gnutls_datum_t *cert_list;
   unsigned cert_list_size = 0;
-  gnutls_x509_crt cert;
+  gnutls_x509_crt_t cert;
   size_t i;
   int rc;
 
@@ -209,12 +209,12 @@ logcertinfo (gnutls_session session)
 
 /* This function will log some details of the given session. */
 static void
-logtlsinfo (gnutls_session session)
+logtlsinfo (gnutls_session_t session)
 {
-  gnutls_credentials_type cred;
+  gnutls_credentials_type_t cred;
   const char *protocol =
     gnutls_protocol_get_name (gnutls_protocol_get_version (session));
-  gnutls_kx_algorithm kx = gnutls_kx_get (session);
+  gnutls_kx_algorithm_t kx = gnutls_kx_get (session);
   const char *keyexchange = gnutls_kx_get_name (kx);
   const char *certtype =
     gnutls_certificate_type_get_name (gnutls_certificate_type_get (session));
@@ -321,7 +321,7 @@ kdc_extension (struct listenspec *ls)
   gnutls_certificate_server_set_request (ls->session, GNUTLS_CERT_REQUEST);
 
   gnutls_dh_set_prime_bits (ls->session, DH_BITS);
-  gnutls_transport_set_ptr (ls->session, (gnutls_transport_ptr)
+  gnutls_transport_set_ptr (ls->session, (gnutls_transport_ptr_t)
                            (unsigned long) ls->sockfd);
 
   gnutls_db_set_retrieve_function (ls->session, resume_db_fetch);


hooks/post-receive
-- 
GNU shishi