From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 15 Nov 2013 08:54:52 +0000 (+0100)
Subject: correctly set the ciphersuite when the set_premaster interface is used.
X-Git-Tag: gnutls_3_3_0pre0~595
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c65b32ed9a5dfdd6d3b32cd5c8e0d6861637cf1;p=thirdparty%2Fgnutls.git

correctly set the ciphersuite when the set_premaster interface is used.
---

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 9b924c9b1c..1f64865876 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1668,6 +1668,11 @@ _gnutls_client_check_if_resuming(gnutls_session_t session,
 		       session->security_parameters.client_random,
 		       GNUTLS_RANDOM_SIZE);
 
+		memcpy(session->security_parameters.cipher_suite,
+			session->internals.resumed_security_parameters.cipher_suite, 2);
+                session->security_parameters.compression_method =
+		        session->internals.resumed_security_parameters.compression_method;
+
 		_gnutls_epoch_set_cipher_suite
 		    (session, EPOCH_NEXT,
 		     session->internals.resumed_security_parameters.