Removed: gnutls_session_get_server_random, gnutls_session_get_client_random, gnutls_s...

diff --git a/NEWS b/NEWS
index a3e2c3a12efa478ca227294466d227598a3b64a4..e82d9b0b7f693e4c35796f35e20d7f34d07ae881 100644 (file)
--- 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_state.c b/lib/gnutls_state.c
index 5f0a1ce439af821bcddee21fbbae4c60f804245b..d3d34d63a4366745e0885e7fedece0dbf7687238 100644 (file)
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1062,72 +1062,6 @@ gnutls_prf (gnutls_session_t session,
   return ret;
 }
 
-/*-
- * 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.

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index d45f47abe85278f492e454ba04e475d76ab9fbd7..cc62eb249df602f6bfa144457c75288bca106aeb 100644 (file)
--- 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,