[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-88-g5439c6e

[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=5439c6e15bded9f454c853ab70eec032988b48f5

The branch, master has been updated
       via  5439c6e15bded9f454c853ab70eec032988b48f5 (commit)
       via  3b3db4088752b6d7bfb9c732e4f18b6627511b2e (commit)
      from  7f74c56e76b97f34de90e5e659251063d3898916 (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 5439c6e15bded9f454c853ab70eec032988b48f5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun May 27 14:02:38 2012 +0200

    corrected typo

commit 3b3db4088752b6d7bfb9c732e4f18b6627511b2e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun May 27 13:53:35 2012 +0200

    corrected data copy

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

Summary of changes:
 lib/gnutls_session_pack.c |    8 ++++----
 lib/gnutls_x509.c         |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index 77960dd..3e89b98 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -819,20 +819,20 @@ unpack_security_parameters (gnutls_session_t session, 
gnutls_buffer_st * ps)
   BUFFER_POP_NUM (ps, session->internals.resumed_security_parameters.version);
 
   BUFFER_POP (ps,
-              &session->internals.resumed_security_parameters.master_secret,
+              session->internals.resumed_security_parameters.master_secret,
               GNUTLS_MASTER_SIZE);
 
   BUFFER_POP (ps,
-              &session->internals.resumed_security_parameters.client_random,
+              session->internals.resumed_security_parameters.client_random,
               GNUTLS_RANDOM_SIZE);
   BUFFER_POP (ps,
-              &session->internals.resumed_security_parameters.server_random,
+              session->internals.resumed_security_parameters.server_random,
               GNUTLS_RANDOM_SIZE);
   BUFFER_POP_NUM (ps,
                   session->internals.
                   resumed_security_parameters.session_id_size);
 
-  BUFFER_POP (ps, &session->internals.resumed_security_parameters.session_id,
+  BUFFER_POP (ps, session->internals.resumed_security_parameters.session_id,
               session->internals.resumed_security_parameters.session_id_size);
 
   BUFFER_POP_NUM (ps,
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 18a86f2..12af295 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1606,7 +1606,7 @@ gnutls_certificate_set_x509_trust_file 
(gnutls_certificate_credentials_t cred,
 int
 gnutls_certificate_set_x509_system_trust (gnutls_certificate_credentials_t 
cred)
 {
-  return gnutls_x509_trust_list_add_system_trust(cred->list, 0, 0);
+  return gnutls_x509_trust_list_add_system_trust(cred->tlist, 0, 0);
 }
 
 static int


hooks/post-receive
-- 
GNU gnutls