[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-12-g21edb48

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=21edb481ef420b5f9056f2c3f4e23c70ab3f869c

The branch, master has been updated
       via  21edb481ef420b5f9056f2c3f4e23c70ab3f869c (commit)
       via  9833df7d176b1cd57e8cd2bca2c217629e1cc76f (commit)
      from  34accce9f830d5cd30746535ddf23ef89a38cc72 (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 21edb481ef420b5f9056f2c3f4e23c70ab3f869c
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Mon Mar 19 19:18:37 2012 +0100

    Added gnutls_session_get_random()

commit 9833df7d176b1cd57e8cd2bca2c217629e1cc76f
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Sun Mar 18 20:36:36 2012 +0100

    added missing function

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

Summary of changes:
 .gitignore                      |    2 ++
 NEWS                            |    3 +++
 doc/cha-upgrade.texi            |   24 ++++++++++++++++++++----
 lib/gnutls_state.c              |   31 +++++++++++++++++++++++++++++++
 lib/includes/gnutls/gnutls.h.in |    2 ++
 lib/libgnutls.map               |    2 ++
 6 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f99f9a2..c60ef7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -592,3 +592,5 @@ tests/mini-tdb
 tests/resume-dtls
 tests/mini-record
 tests/srp/mini-srp
+doc/stamp_functions
+doc/latex/cha-upgrade.tex
diff --git a/NEWS b/NEWS
index 182951b..27a258c 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ as GeneralizedTime instead of UTCTime (which only stores
 gnutls_x509_crt_set_private_key_usage_period: Added
 gnutls_x509_crt_get_private_key_usage_period: Added
 gnutls_x509_crq_set_private_key_usage_period: Added
+gnutls_x509_crq_get_private_key_usage_period: Added
+gnutls_session_get_random: Added
+
 
 * Version 3.0.17 (released 2012-03-17)
 
diff --git a/doc/cha-upgrade.texi b/doc/cha-upgrade.texi
index 0a7a2d3..6b8c613 100644
--- a/doc/cha-upgrade.texi
+++ b/doc/cha-upgrade.texi
@@ -25,8 +25,24 @@ functionality as described in @ref{Asynchronous operation}.
 
 @heading Upgrading to 3.0.x from previous versions
 
-GnuTLS 3.0.x is source compatible with previous versions but discarded the function
-@funcintref{gnutls_transport_set_lowat}.
-The function @funcref{gnutls_record_check_pending} has to be used to achieve 
-the same functionality as described in @ref{Asynchronous operation}.
+GnuTLS 3.0.x is source compatible with previous versions but discarded the functions
+@funcintref{gnutls_transport_set_lowat}, @funcintref{gnutls_session_get_client_random},
+@funcintref{gnutls_session_get_server_random}, @funcintref{gnutls_session_get_master_secret}.
+
+@multitable @columnfractions .30 .60
+@headitem Old function @tab Replacement
+
+@item @funcintref{gnutls_transport_set_lowat} @tab
+To replace its functionality the function @funcref{gnutls_record_check_pending} has to be used,
+as described in @ref{Asynchronous operation}
+
+@item @funcintref{gnutls_session_get_server_random},
+@funcintref{gnutls_session_get_client_random} 
+@tab 
+They are replaced by the safer function @ref{gnutls_session_get_random}
+
+@item @funcintref{gnutls_session_get_master_secret} 
+@tab Replaced by the keying material exporters discussed in @ref{Keying Material Exporters}
+
+@end multitable
 
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index c8773c4..c0fdaa3 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1431,3 +1431,34 @@ gnutls_protocol_get_version (gnutls_session_t session)
 {
   return _gnutls_protocol_get_version(session);
 }
+
+/**
+ * gnutls_session_get_random:
+ * @session: is a #gnutls_session_t structure.
+ * @client: the client part of the random
+ * @server: the server part of the random
+ *
+ * This functions returns pointers to the client and server
+ * random fields used in the TLS handshake. The pointers are
+ * not to be modified or deallocated.
+ *
+ * If a client random value has not yet been established, the output
+ * will be garbage.
+ *
+ * Since: 3.0
+ **/
+void
+gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t* client, gnutls_datum_t* server)
+{
+  if (client)
+    {
+      client->data = session->security_parameters.client_random;
+      client->size = sizeof(session->security_parameters.client_random);
+    }
+
+  if (server)
+    {
+      server->data = session->security_parameters.server_random;
+      server->size = sizeof(session->security_parameters.server_random);
+    }
+}
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index d67a79d..f314be8 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -960,6 +960,8 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
                                size_t * session_data_size);
   int gnutls_session_get_data2 (gnutls_session_t session,
                                 gnutls_datum_t * data);
+  void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t* client, 
+                                  gnutls_datum_t* server);
 
 /* returns the session ID */
 #define GNUTLS_MAX_SESSION_ID 32
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index bd665c1..3193848 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -782,8 +782,10 @@ GNUTLS_3_0_0 {
 	gnutls_tdb_deinit;
 	gnutls_x509_crt_set_authority_info_access;
 	gnutls_x509_crt_get_private_key_usage_period;
+	gnutls_x509_crq_get_private_key_usage_period;
 	gnutls_x509_crt_set_private_key_usage_period;
 	gnutls_x509_crq_set_private_key_usage_period;
+	gnutls_session_get_random;
 } GNUTLS_2_12;
 
 GNUTLS_PRIVATE {


hooks/post-receive
-- 
GNU gnutls