[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-144-g4dd3adf

[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=4dd3adf7d4eccf2a5c7c16ee89610d9f0df81613

The branch, master has been updated
       via  4dd3adf7d4eccf2a5c7c16ee89610d9f0df81613 (commit)
       via  eb530c7cdfff2119ec74cedb3f372e1f0c41fa2f (commit)
      from  d1a4913be216efa2999cbcc86f472c04d5ffee03 (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 4dd3adf7d4eccf2a5c7c16ee89610d9f0df81613
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 9 15:42:45 2012 +0200

    Revert "documented pin_callback expectations."
    
    This reverts commit 2576a9d933e4f29f69a7182faa9c4210eeec8fee.

commit eb530c7cdfff2119ec74cedb3f372e1f0c41fa2f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 9 15:41:30 2012 +0200

    added author of code.

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

Summary of changes:
 AUTHORS                              |    3 +++
 NEWS                                 |    2 +-
 doc/examples/ex-cert-select-pkcs11.c |    5 -----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e6bd90b..fa706cd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -74,6 +74,9 @@ Win32 patches.
 Andy Polyakov <appro [at] openssl.org>
 AES-NI and Padlock assembler code (at lib/accelerated/intel/asm/)
 
+David Woodhouse <dwmw2 [at] infradead.org>
+DTLS 0.9 implementation.
+
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/NEWS b/NEWS
index 4fd8c55..0a38d6b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ and --benchmark-tls-ciphers
 ** libgnutls: Added support for an old version of the DTLS protocol
 used by openconnect vpn client for compatibility with Cisco's AnyConnect 
 SSL VPN. It is marked as GNUTLS_DTLS0_9. Do not use it for newer protocols
-as it has issues.
+as it has issues. Implemented by David Woodhouse.
 
 ** libgnutls: requires libnettle 2.5.
 
diff --git a/doc/examples/ex-cert-select-pkcs11.c 
b/doc/examples/ex-cert-select-pkcs11.c
index 83c2e64..e8cb21e 100644
--- a/doc/examples/ex-cert-select-pkcs11.c
+++ b/doc/examples/ex-cert-select-pkcs11.c
@@ -46,11 +46,6 @@ pin_callback (void *user, int attempt, const char *token_url,
 {
   const char *password;
   int len;
-  
-  /* Note that a PIN callback may be called multiple times during a
-   * session. It is expected to cache and return the same PIN for
-   * the same token_url, unless flags is set to GNUTLS_PKCS11_PIN_WRONG.
-   */
 
   printf ("PIN required for token '%s' with URL '%s'\n", token_label,
           token_url);


hooks/post-receive
-- 
GNU gnutls