[SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-15-g82c9716

[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=82c9716470d027af6bb34e06d0ed4af8fe80a4b3

The branch, master has been updated
       via  82c9716470d027af6bb34e06d0ed4af8fe80a4b3 (commit)
       via  49aec0ff9a1120f7930f2e9891ba8ccd745f5f0b (commit)
       via  6f6d7dc780416a30db155a7cce102a3f6850dc94 (commit)
      from  206da0ac665d8770a00fc190716d9172c84e9c40 (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 82c9716470d027af6bb34e06d0ed4af8fe80a4b3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Oct 28 22:53:44 2012 +0100

    corrections in benchmark measured average time.

commit 49aec0ff9a1120f7930f2e9891ba8ccd745f5f0b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Oct 28 05:01:55 2012 +0100

    corrected typo

commit 6f6d7dc780416a30db155a7cce102a3f6850dc94
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Oct 28 04:47:20 2012 +0100

    mention new function

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

Summary of changes:
 NEWS                   |    1 +
 doc/cha-intro-tls.texi |    3 ++-
 src/benchmark-tls.c    |    9 ++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 206dc0c..aa242d8 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ the available revocation data validity.
 ** danetool: Corrected bug that prevented loading PEM files.
 
 ** API and ABI modifications:
+gnutls_session_get_id2: Added
 GNUTLS_CERT_REVOCATION_DATA_TOO_OLD: Added.
 GNUTLS_CERT_REVOCATION_DATA_INVALID: Added.
 
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 3329da9..f53cc96 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -583,7 +583,8 @@ way a client avoids an additional connection to the OCSP 
server.
 
 A server is required to provide the OCSP server's response using the 
@funcref{gnutls_certificate_set_ocsp_status_request_file}.
 The response may be obtained periodically using the following command.
address@hidden example
+
address@hidden
 ocsptool --ask --load-cert server_cert.pem --load-issuer the_issuer.pem
          --load-signer the_issuer.pem --outfile ocsp.response
 @end example
diff --git a/src/benchmark-tls.c b/src/benchmark-tls.c
index 37a2a32..8ff6404 100644
--- a/src/benchmark-tls.c
+++ b/src/benchmark-tls.c
@@ -321,6 +321,8 @@ static void test_ciphersuite_kx(const char *cipher_prio)
     struct timespec tr_start, tr_stop;
     double avg, sstddev;
 
+    diffs_size = 0;
+
     /* Init server */
     gnutls_certificate_allocate_credentials(&s_certcred);
     gnutls_anon_allocate_server_credentials(&s_anoncred);
@@ -344,7 +346,6 @@ static void test_ciphersuite_kx(const char *cipher_prio)
     start_benchmark(&st);
 
     do {
-        gettime(&tr_start);
         
         gnutls_init(&server, GNUTLS_SERVER);
         ret = gnutls_priority_set_direct(server, cipher_prio, &str);
@@ -373,8 +374,12 @@ static void test_ciphersuite_kx(const char *cipher_prio)
         gnutls_transport_set_pull_function(client, client_pull);
         gnutls_transport_set_ptr(client, (gnutls_transport_ptr_t) client);
 
+        gettime(&tr_start);
+
         HANDSHAKE(client, server);
 
+        gettime(&tr_stop);
+
         if (suite == NULL)
             suite = gnutls_cipher_suite_get_name(gnutls_kx_get(server),
                                                  gnutls_cipher_get(server),
@@ -383,8 +388,6 @@ static void test_ciphersuite_kx(const char *cipher_prio)
         gnutls_deinit(client);
         gnutls_deinit(server);
 
-        gettime(&tr_stop);
-
         diffs[diffs_size++] = timespec_sub_ms(&tr_stop, &tr_start);
         if (diffs_size > sizeof(diffs))
           abort();


hooks/post-receive
-- 
GNU gnutls