[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-89-ge971ba8

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

The branch, master has been updated
       via  e971ba89e1fac6892ead5c2210e4687055cbad79 (commit)
       via  4bb4b0eca6e48fdb046ad53ad35d2d2d72b9edcd (commit)
      from  1127174a688db211a6162345f9fca704f1dd664c (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 e971ba89e1fac6892ead5c2210e4687055cbad79
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Feb 5 23:42:32 2011 +0100

    Added missing definitions (GNUTLS_MASTER_SIZE etc).

commit 4bb4b0eca6e48fdb046ad53ad35d2d2d72b9edcd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Feb 5 12:46:32 2011 +0100

    Removed: gnutls_session_get_server_random, 
gnutls_session_get_client_random, gnutls_session_get_master_secret

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

Summary of changes:
 NEWS                         |    6 ++--
 lib/gnutls_int.h             |    3 ++
 lib/gnutls_state.c           |   66 ------------------------------------------
 lib/includes/gnutls/compat.h |   13 --------
 4 files changed, 6 insertions(+), 82 deletions(-)

diff --git a/NEWS b/NEWS
index a3e2c3a..e82d9b0 100644
--- a/NEWS
+++ b/NEWS
@@ -71,9 +71,6 @@ gnutls_x509_privkey_sign_hash: DEPRECATED (use: 
gnutls_privkey_sign_hash2)
 gnutls_x509_privkey_verify_data: DEPRECATED (use: gnutls_pubkey_verify_data)
 gnutls_psk_netconf_derive_key: DEPRECATED
 gnutls_session_set_finished_function: DEPRECATED
-gnutls_session_get_server_random: DEPRECATED
-gnutls_session_get_client_random: DEPRECATED
-gnutls_session_get_master_secret: DEPRECATED
 gnutls_x509_crt_verify_hash: DEPRECATED (use: gnutls_pubkey_verify_hash)
 gnutls_x509_crt_verify_data: DEPRECATED (use: gnutls_pubkey_verify_data)
 gnutls_x509_crt_get_verify_algorithm: DEPRECATED (use: 
gnutls_pubkey_get_verify_algorithm)
@@ -85,6 +82,9 @@ gnutls_privkey_sign_hash: REMOVED (was added in 2.11.0)
 gnutls_ext_register: REMOVED
 gnutls_certificate_get_x509_crls: REMOVED
 gnutls_certificate_get_x509_cas: REMOVED
+gnutls_session_get_server_random: REMOVED
+gnutls_session_get_client_random: REMOVED
+gnutls_session_get_master_secret: REMOVED
 
 * Version 2.11.6 (released 2010-12-06)
 
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 00a6f20..15d8735 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -92,6 +92,9 @@ typedef struct
 #define SESSION_TICKET_IV_SIZE 16
 #define SESSION_TICKET_MAC_SECRET_SIZE 32
 
+#define GNUTLS_MASTER_SIZE 48
+#define GNUTLS_RANDOM_SIZE 32
+
 /* we can receive up to MAX_EXT_TYPES extensions.
  */
 #define MAX_EXT_TYPES 32
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 5f0a1ce..d3d34d6 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1063,72 +1063,6 @@ gnutls_prf (gnutls_session_t session,
 }
 
 /*-
- * gnutls_session_get_client_random:
- * @session: is a #gnutls_session_t structure.
- *
- * Return a pointer to the 32-byte client random field used in the
- * session.  The pointer must not be modified or deallocated.
- *
- * If a client random value has not yet been established, the output
- * will be garbage; in particular, a %NULL return value should not be
- * 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.
- *
- * Return a pointer to the 32-byte server random field used in the
- * session.  The pointer must not be modified or deallocated.
- *
- * If a server random value has not yet been established, the output
- * will be garbage; in particular, a %NULL return value should not be
- * 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.
- *
- * Return a pointer to the 48-byte master secret in the session.  The
- * pointer must not be modified or deallocated.
- *
- * If a master secret value has not yet been established, the output
- * will be garbage; in particular, a %NULL return value should not be
- * expected.
- *
- * Consider using gnutls_prf() rather than extracting the master
- * 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.
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index d45f47a..cc62eb2 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -188,19 +188,6 @@ gnutls_sign_callback_get (gnutls_session_t session, void 
**userdata)
                                                 func)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 
-/* returns security values. 
- * Do not use them unless you know what you're doing. Those are dangerous since
- * they depend on a particular TLS version number
- */
-#define GNUTLS_MASTER_SIZE 48
-#define GNUTLS_RANDOM_SIZE 32
-     const void *gnutls_session_get_server_random (gnutls_session_t session)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-     const void *gnutls_session_get_client_random (gnutls_session_t session)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-     const void *gnutls_session_get_master_secret (gnutls_session_t session)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-
      int gnutls_psk_netconf_derive_key (const char *password,
                                         const char *psk_identity,
                                         const char *psk_identity_hint,


hooks/post-receive
-- 
GNU gnutls