[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-121-ge1bdca1

[Simon Josefsson]

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=e1bdca16d4910fb26722c6bfc3012a132d495f5b

The branch, gnutls_2_12_x has been updated
       via  e1bdca16d4910fb26722c6bfc3012a132d495f5b (commit)
      from  758f9b91517668524b405261f20bacb17b0c9008 (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 e1bdca16d4910fb26722c6bfc3012a132d495f5b
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:59:28 2011 +0100

    Fix docstring of deprecated function.

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

Summary of changes:
 lib/gnutls_psk_netconf.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/gnutls_psk_netconf.c b/lib/gnutls_psk_netconf.c
index 1df072b..1219877 100644
--- a/lib/gnutls_psk_netconf.c
+++ b/lib/gnutls_psk_netconf.c
@@ -31,7 +31,7 @@
 #ifdef ENABLE_PSK
 
 
-/*-
+/**
  * gnutls_psk_netconf_derive_key:
  * @password: zero terminated string containing password.
  * @psk_identity: zero terminated string with PSK identity.
@@ -44,8 +44,11 @@
  * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
  *
  * Since: 2.4.0
- * Deprecated in: 2.11.0
- -*/
+ *
+ * Deprecated: The need for this interface was dropped from the
+ * standard on publication as a RFC.  The function works now but will
+ * return a hard failure in a future release.
+ */
 int
 gnutls_psk_netconf_derive_key (const char *password,
                                const char *psk_identity,


hooks/post-receive
-- 
GNU gnutls