[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-44-gb75633f

[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=b75633f79e5fccb89bb256956dea1eece27b9adb

The branch, master has been updated
       via  b75633f79e5fccb89bb256956dea1eece27b9adb (commit)
       via  559ee10884f68f4a10488c803d6ec127c1070535 (commit)
       via  6cdde2dedcd67cf2a8de5972ffd5f21401d9de64 (commit)
      from  280ab14a51d8e7368c37a389dcf2448a18e94771 (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 b75633f79e5fccb89bb256956dea1eece27b9adb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Dec 19 05:45:42 2010 +0100

    Use SRP for password authentication.

commit 559ee10884f68f4a10488c803d6ec127c1070535
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Dec 19 05:41:30 2010 +0100

    Do not include deprecated functions to library documentation.

commit 6cdde2dedcd67cf2a8de5972ffd5f21401d9de64
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Dec 19 05:31:02 2010 +0100

    gnutls_x509_privkey_verify_data() was deprecated.

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

Summary of changes:
 NEWS                         |    1 +
 doc/cha-auth.texi            |    9 +++++----
 lib/gnutls_cert.c            |   12 ++++++++----
 lib/gnutls_extensions.c      |    6 +++---
 lib/gnutls_psk_netconf.c     |    5 +++--
 lib/gnutls_state.c           |   23 +++++++++++++++--------
 lib/includes/gnutls/compat.h |   15 +++++++++++++--
 lib/includes/gnutls/x509.h   |    4 ----
 lib/x509/privkey.c           |    8 ++++++--
 9 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/NEWS b/NEWS
index 2a927ff..8ed595d 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ gnutls_privkey_sign_hash2: ADDED
 gnutls_x509_privkey_sign_hash2: ADDED
 gnutls_x509_privkey_sign_data2: ADDED
 gnutls_x509_privkey_sign_hash: DEPRECATED
+gnutls_x509_privkey_verify_data: DEPRECATED
 gnutls_psk_netconf_derive_key: DEPRECATED
 gnutls_session_set_finished_function: DEPRECATED
 gnutls_ext_register: DEPRECATED
diff --git a/doc/cha-auth.texi b/doc/cha-auth.texi
index 42fe4ec..f02fd97 100644
--- a/doc/cha-auth.texi
+++ b/doc/cha-auth.texi
@@ -341,11 +341,12 @@ by sending a hint.  In the server, specify the hint by 
calling
 the hint, for example in the callback function, using
 @ref{gnutls_psk_client_get_hint}.
 
-There is no standard mechanism to derive a PSK key from a password
-specified by the TLS PSK document.  GnuTLS provides
address@hidden which follows the algorithm
+There is no mechanism to derive a PSK key from a password
+specified by the TLS PSK address@hidden used to provide
address@hidden which follows the algorithm
 specified in @file{draft-ietf-netconf-tls-02.txt}. This method
-is deprecated and might be removed in later versions of GnuTLS.
+is deprecated and might be removed in later versions of GnuTLS.}.
+For password-based authentication check @ref{Authentication using SRP}.
 
 Some helper functions such as:
 
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 8b27b63..ab6831f 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -984,7 +984,7 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
   _gnutls_free_datum (&cert->raw);
 }
 
-/**
+/*-
  * gnutls_sign_callback_set:
  * @session: is a gnutls session
  * @sign_func: function pointer to application's sign callback.
@@ -1002,7 +1002,9 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
  * The @userdata parameter is passed to the @sign_func verbatim, and
  * can be used to store application-specific data needed in the
  * callback function.  See also gnutls_sign_callback_get().
- **/
+ *
+ * Deprecated in: 2.11.0
+ -*/
 void
 gnutls_sign_callback_set (gnutls_session_t session,
                           gnutls_sign_func sign_func, void *userdata)
@@ -1011,7 +1013,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
   session->internals.sign_func_userdata = userdata;
 }
 
-/**
+/*-
  * gnutls_sign_callback_get:
  * @session: is a gnutls session
  * @userdata: if non-%NULL, will be set to abstract callback pointer.
@@ -1020,7 +1022,9 @@ gnutls_sign_callback_set (gnutls_session_t session,
  *
  * Returns: The function pointer set by gnutls_sign_callback_set(), or
  *   if not set, %NULL.
- **/
+ *
+ * Deprecated in: 2.11.0
+ -*/
 gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
 {
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index a3b3c0f..05ca7e2 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -396,7 +396,7 @@ _gnutls_ext_register (extension_entry_st * mod)
   return GNUTLS_E_SUCCESS;
 }
 
-/**
+/*-
  * gnutls_ext_register:
  * @type: the 16-bit integer referring to the extension type
  * @name: human printable name of the extension used for debugging
@@ -408,8 +408,8 @@ _gnutls_ext_register (extension_entry_st * mod)
  *
  * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
  *
- * Since: 2.6.0
- **/
+ * Deprecated in: 2.11.0
+ -*/
 int
 gnutls_ext_register (int type,
                      const char *name,
diff --git a/lib/gnutls_psk_netconf.c b/lib/gnutls_psk_netconf.c
index 3c24ba0..1df072b 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,7 +44,8 @@
  * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
  *
  * Since: 2.4.0
- **/
+ * Deprecated in: 2.11.0
+ -*/
 int
 gnutls_psk_netconf_derive_key (const char *password,
                                const char *psk_identity,
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 2d9d79c..5f0a1ce 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1062,7 +1062,7 @@ gnutls_prf (gnutls_session_t session,
   return ret;
 }
 
-/**
+/*-
  * gnutls_session_get_client_random:
  * @session: is a #gnutls_session_t structure.
  *
@@ -1074,14 +1074,16 @@ gnutls_prf (gnutls_session_t session,
  * expected.
  *
  * Returns: pointer to client random data.
- **/
+ *
+ * Deprecated in: 2.11.0
+ -*/
 const void *
 gnutls_session_get_client_random (gnutls_session_t session)
 {
   return (char *) session->security_parameters.client_random;
 }
 
-/**
+/*-
  * gnutls_session_get_server_random:
  * @session: is a #gnutls_session_t structure.
  *
@@ -1093,14 +1095,16 @@ gnutls_session_get_client_random (gnutls_session_t 
session)
  * expected.
  *
  * Returns: pointer to server random data.
- **/
+ *
+ * Deprecated in: 2.11.0
+ -*/
 const void *
 gnutls_session_get_server_random (gnutls_session_t session)
 {
   return (char *) session->security_parameters.server_random;
 }
 
-/**
+/*-
  * gnutls_session_get_master_secret:
  * @session: is a #gnutls_session_t structure.
  *
@@ -1115,14 +1119,16 @@ gnutls_session_get_server_random (gnutls_session_t 
session)
  * secret and use it to derive further data.
  *
  * Returns: pointer to master secret data.
- **/
+ *
+ * Deprecated in: 2.11.0
+ -*/
 const void *
 gnutls_session_get_master_secret (gnutls_session_t session)
 {
   return (char *) session->security_parameters.master_secret;
 }
 
-/**
+/*-
  * gnutls_session_set_finished_function:
  * @session: is a #gnutls_session_t structure.
  * @func: a #gnutls_finished_callback_func callback.
@@ -1146,7 +1152,8 @@ gnutls_session_get_master_secret (gnutls_session_t 
session)
  * finished message for later use.
  *
  * Since: 2.6.0
- **/
+ * Deprecated in: 2.11.0
+ -*/
 void
 gnutls_session_set_finished_function (gnutls_session_t session,
                                       gnutls_finished_callback_func func)
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index e0191e1..2f05bbe 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -172,10 +172,12 @@ gnutls_sign_callback_set (gnutls_session_t session,
                           gnutls_sign_func sign_func, void *userdata)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 gnutls_sign_func
-gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
+gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* Extension API is no longer exported because a lot of internal
- * structures are used.
+ * structures are used. Currently it works due to a compatibility
+ * layer, but will be removed in later versions.
  */
      int gnutls_ext_register (int type,
                               const char *name,
@@ -223,4 +225,13 @@ gnutls_sign_callback_get (gnutls_session_t session, void 
**userdata);
                                         gnutls_datum_t * signature)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 
+/* Deprecated because verify_* functions are moved to public
+ * keys. Check abstract.h for similar functionality.
+ */
+  int gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
+                                       unsigned int flags,
+                                       const gnutls_datum_t * data,
+                                       const gnutls_datum_t * signature)
+                                       _GNUTLS_GCC_ATTR_DEPRECATED;
+
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 646c584..5221b95 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -721,10 +721,6 @@ extern "C"
                                       unsigned int flags,
                                       const gnutls_datum_t * data,
                                       gnutls_datum_t * signature);
-  int gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
-                                       unsigned int flags,
-                                       const gnutls_datum_t * data,
-                                       const gnutls_datum_t * signature);
   int gnutls_x509_crt_verify_data (gnutls_x509_crt_t crt,
                                    unsigned int flags,
                                    const gnutls_datum_t * data,
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index b5ad997..9ddb2e8 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1725,6 +1725,8 @@ cleanup:
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
+ *
+ * Deprecated in: 2.11.0
  -*/
 int
 gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
@@ -1879,7 +1881,7 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
 }
 
 
-/**
+/*-
  * gnutls_x509_privkey_verify_data:
  * @key: Holds the key
  * @flags: should be 0 for now
@@ -1891,7 +1893,9 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
  *
  * Returns: In case of a verification failure %GNUTLS_E_PK_SIG_VERIFY_FAILED 
  * is returned, and a positive code on success.
- **/
+ *
+ * Deprecated in: 2.11.0
+ -*/
 int
 gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
                                  unsigned int flags,


hooks/post-receive
-- 
GNU gnutls