[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-37-gd27445d

[Nikos Mavrogiannopoulos]

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 gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=d27445d8deb4ec6fcb85394d8628c756284d33ed

The branch, master has been updated
       via  d27445d8deb4ec6fcb85394d8628c756284d33ed (commit)
       via  3b300c4263ad641788016e30159388f3bcd4f5d4 (commit)
       via  15bf7be0a835880e7016848d23b469e29818a073 (commit)
      from  e9f1baffe51b03459219c841e06bf598685da7dc (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 d27445d8deb4ec6fcb85394d8628c756284d33ed
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 24 01:18:18 2012 +0100

    updated

commit 3b300c4263ad641788016e30159388f3bcd4f5d4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 24 01:18:02 2012 +0100

    Fixes for win32 and time. OCSP test now sets a fixed time to avoid 
expiration errors.

commit 15bf7be0a835880e7016848d23b469e29818a073
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 24 01:03:43 2012 +0100

    simplified internal function names.

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

Summary of changes:
 cross.mk              |    8 ++++----
 lib/auth/cert.c       |   12 ++++++------
 lib/auth/cert.h       |    4 ++--
 lib/auth/dhe.c        |   16 ++++++++--------
 lib/auth/rsa.c        |    4 ++--
 lib/auth/rsa_export.c |    4 ++--
 lib/auth/srp_rsa.c    |    4 ++--
 tests/ocsp.c          |   14 +++++++++++++-
 tests/openpgp-auth2.c |    2 ++
 tests/resume-dtls.c   |   13 ++++++++++++-
 10 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/cross.mk b/cross.mk
index 006bf90..72cca61 100644
--- a/cross.mk
+++ b/cross.mk
@@ -2,11 +2,11 @@
 GNUTLS_FILE:=gnutls-3.0.17.tar.xz
 GNUTLS_DIR:=gnutls-3.0.17
 
-GMP_FILE:=gmp-5.0.2.tar.bz2
-GMP_DIR:=gmp-5.0.2
+GMP_FILE:=gmp-5.0.4.tar.bz2
+GMP_DIR:=gmp-5.0.4
 
-P11_KIT_FILE:=p11-kit-0.11.tar.gz
-P11_KIT_DIR:=p11-kit-0.11
+P11_KIT_FILE:=p11-kit-0.12.tar.gz
+P11_KIT_DIR:=p11-kit-0.12
 
 NETTLE_FILE:=nettle-2.4.tar.gz
 NETTLE_DIR:=nettle-2.4
diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index 7582c75..d26fb6e 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -1023,7 +1023,7 @@ _gnutls_gen_openpgp_certificate_fpr (gnutls_session_t 
session,
 
 
 int
-_gnutls_gen_cert_client_certificate (gnutls_session_t session,
+_gnutls_gen_cert_client_crt (gnutls_session_t session,
                                      gnutls_buffer_st * data)
 {
   switch (session->security_parameters.cert_type)
@@ -1045,7 +1045,7 @@ _gnutls_gen_cert_client_certificate (gnutls_session_t 
session,
 }
 
 int
-_gnutls_gen_cert_server_certificate (gnutls_session_t session,
+_gnutls_gen_cert_server_crt (gnutls_session_t session,
                                      gnutls_buffer_st * data)
 {
   switch (session->security_parameters.cert_type)
@@ -1067,7 +1067,7 @@ _gnutls_gen_cert_server_certificate (gnutls_session_t 
session,
 
 #define CLEAR_CERTS for(x=0;x<peer_certificate_list_size;x++) 
gnutls_pcert_deinit(&peer_certificate_list[x])
 static int
-_gnutls_proc_x509_server_certificate (gnutls_session_t session,
+_gnutls_proc_x509_server_crt (gnutls_session_t session,
                                       uint8_t * data, size_t data_size)
 {
   int size, len, ret;
@@ -1209,7 +1209,7 @@ cleanup:
 
 #ifdef ENABLE_OPENPGP
 static int
-_gnutls_proc_openpgp_server_certificate (gnutls_session_t session,
+_gnutls_proc_openpgp_server_crt (gnutls_session_t session,
                                          uint8_t * data, size_t data_size)
 {
   int size, ret, len;
@@ -1428,12 +1428,12 @@ _gnutls_proc_certificate (gnutls_session_t session,
     {
 #ifdef ENABLE_OPENPGP
     case GNUTLS_CRT_OPENPGP:
-      ret = _gnutls_proc_openpgp_server_certificate (session,
+      ret = _gnutls_proc_openpgp_server_crt (session,
                                                      data, data_size);
       break;
 #endif
     case GNUTLS_CRT_X509:
-      ret = _gnutls_proc_x509_server_certificate (session, data, data_size);
+      ret = _gnutls_proc_x509_server_crt (session, data, data_size);
       break;
     default:
       gnutls_assert ();
diff --git a/lib/auth/cert.h b/lib/auth/cert.h
index 55ff0bd..c64bf2e 100644
--- a/lib/auth/cert.h
+++ b/lib/auth/cert.h
@@ -122,8 +122,8 @@ typedef struct cert_auth_info_st cert_auth_info_st;
 void _gnutls_free_rsa_info (rsa_info_st * rsa);
 
 /* AUTH X509 functions */
-int _gnutls_gen_cert_server_certificate (gnutls_session_t, gnutls_buffer_st *);
-int _gnutls_gen_cert_client_certificate (gnutls_session_t, gnutls_buffer_st *);
+int _gnutls_gen_cert_server_crt (gnutls_session_t, gnutls_buffer_st *);
+int _gnutls_gen_cert_client_crt (gnutls_session_t, gnutls_buffer_st *);
 int _gnutls_gen_cert_client_cert_vrfy (gnutls_session_t, gnutls_buffer_st *);
 int _gnutls_gen_cert_server_cert_req (gnutls_session_t, gnutls_buffer_st *);
 int _gnutls_proc_cert_cert_req (gnutls_session_t, uint8_t *, size_t);
diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c
index fb84cee..659ee98 100644
--- a/lib/auth/dhe.c
+++ b/lib/auth/dhe.c
@@ -45,8 +45,8 @@ static int proc_dhe_client_kx (gnutls_session_t, uint8_t *, 
size_t);
 
 const mod_auth_st ecdhe_ecdsa_auth_struct = {
   "ECDHE_ECDSA",
-  _gnutls_gen_cert_server_certificate,
-  _gnutls_gen_cert_client_certificate,
+  _gnutls_gen_cert_server_crt,
+  _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_ecdh_common_client_kx,   /* This is the only different */
   _gnutls_gen_cert_client_cert_vrfy,
@@ -62,8 +62,8 @@ const mod_auth_st ecdhe_ecdsa_auth_struct = {
 
 const mod_auth_st ecdhe_rsa_auth_struct = {
   "ECDHE_RSA",
-  _gnutls_gen_cert_server_certificate,
-  _gnutls_gen_cert_client_certificate,
+  _gnutls_gen_cert_server_crt,
+  _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_ecdh_common_client_kx,   /* This is the only different */
   _gnutls_gen_cert_client_cert_vrfy,
@@ -79,8 +79,8 @@ const mod_auth_st ecdhe_rsa_auth_struct = {
 
 const mod_auth_st dhe_rsa_auth_struct = {
   "DHE_RSA",
-  _gnutls_gen_cert_server_certificate,
-  _gnutls_gen_cert_client_certificate,
+  _gnutls_gen_cert_server_crt,
+  _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_dh_common_client_kx,
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
@@ -96,8 +96,8 @@ const mod_auth_st dhe_rsa_auth_struct = {
 
 const mod_auth_st dhe_dss_auth_struct = {
   "DHE_DSS",
-  _gnutls_gen_cert_server_certificate,
-  _gnutls_gen_cert_client_certificate,
+  _gnutls_gen_cert_server_crt,
+  _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_dh_common_client_kx,
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c
index 3d1d79a..8658d4a 100644
--- a/lib/auth/rsa.c
+++ b/lib/auth/rsa.c
@@ -46,8 +46,8 @@ static int proc_rsa_client_kx (gnutls_session_t, uint8_t *, 
size_t);
 
 const mod_auth_st rsa_auth_struct = {
   "RSA",
-  _gnutls_gen_cert_server_certificate,
-  _gnutls_gen_cert_client_certificate,
+  _gnutls_gen_cert_server_crt,
+  _gnutls_gen_cert_client_crt,
   NULL,                         /* gen server kx */
   _gnutls_gen_rsa_client_kx,
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
diff --git a/lib/auth/rsa_export.c b/lib/auth/rsa_export.c
index 63458df..fce5789 100644
--- a/lib/auth/rsa_export.c
+++ b/lib/auth/rsa_export.c
@@ -50,8 +50,8 @@ static int proc_rsa_export_client_kx (gnutls_session_t 
session, uint8_t * data,
 
 const mod_auth_st rsa_export_auth_struct = {
   "RSA EXPORT",
-  _gnutls_gen_cert_server_certificate,
-  _gnutls_gen_cert_client_certificate,
+  _gnutls_gen_cert_server_crt,
+  _gnutls_gen_cert_client_crt,
   gen_rsa_export_server_kx,
   _gnutls_gen_rsa_client_kx,
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
diff --git a/lib/auth/srp_rsa.c b/lib/auth/srp_rsa.c
index a18dc4f..3a3649f 100644
--- a/lib/auth/srp_rsa.c
+++ b/lib/auth/srp_rsa.c
@@ -45,7 +45,7 @@ static int proc_srp_cert_server_kx (gnutls_session_t, uint8_t 
*, size_t);
 
 const mod_auth_st srp_rsa_auth_struct = {
   "SRP",
-  _gnutls_gen_cert_server_certificate,
+  _gnutls_gen_cert_server_crt,
   NULL,
   gen_srp_cert_server_kx,
   _gnutls_gen_srp_client_kx,
@@ -62,7 +62,7 @@ const mod_auth_st srp_rsa_auth_struct = {
 
 const mod_auth_st srp_dss_auth_struct = {
   "SRP",
-  _gnutls_gen_cert_server_certificate,
+  _gnutls_gen_cert_server_crt,
   NULL,
   gen_srp_cert_server_kx,
   _gnutls_gen_srp_client_kx,
diff --git a/tests/ocsp.c b/tests/ocsp.c
index a707671..8449923 100644
--- a/tests/ocsp.c
+++ b/tests/ocsp.c
@@ -33,6 +33,16 @@
 
 #include "utils.h"
 
+static time_t mytime (time_t * t)
+{
+  time_t then = 1332548220;
+
+  if (t)
+    *t = then;
+
+  return then;
+}
+
 /* sample request */
 
 static void
@@ -1449,8 +1459,10 @@ doit (void)
       exit (1);
     }
 
+  gnutls_global_set_time_function (mytime);
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (0);
+  if (debug)
+    gnutls_global_set_log_level (99);
 
   ocsp_invalid_calls ();
   req_parse ();
diff --git a/tests/openpgp-auth2.c b/tests/openpgp-auth2.c
index d87f79f..b1db9f2 100644
--- a/tests/openpgp-auth2.c
+++ b/tests/openpgp-auth2.c
@@ -253,6 +253,8 @@ doit ()
   gnutls_global_deinit ();
 }
 #else
+#include <stdlib.h>
+
 void
 doit ()
 {
diff --git a/tests/resume-dtls.c b/tests/resume-dtls.c
index acdb8b5..03f606c 100644
--- a/tests/resume-dtls.c
+++ b/tests/resume-dtls.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
- * Author: Simon Josefsson
+ * Author: Nikos Mavrogiannopoulos
  *
  * This file is part of GnuTLS.
  *
@@ -39,6 +39,15 @@
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
+#if defined(_WIN32)
+
+int main()
+{
+  exit(77);
+}
+
+#else
+
 #include "tcp.c"
 
 #include "utils.h"
@@ -665,3 +674,5 @@ wrap_db_delete (void *dbf, gnutls_datum_t key)
   return -1;
 
 }
+
+#endif /* WIN32 */


hooks/post-receive
-- 
GNU gnutls