From: Martin Willi <martin@revosec.ch>
Date: Tue, 7 Feb 2012 10:41:56 +0000 (+0100)
Subject: Double check if a cached suite is available, overwrite any old suite state
X-Git-Tag: 4.6.2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae10ee6d0b16f392b00e636e9e227aa4988c676a;p=thirdparty%2Fstrongswan.git

Double check if a cached suite is available, overwrite any old suite state
---

diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c
index d8930acbdb..4d84876d01 100644
--- a/src/libtls/tls_crypto.c
+++ b/src/libtls/tls_crypto.c
@@ -1598,7 +1598,7 @@ METHOD(tls_crypto_t, resume_session, tls_cipher_suite_t,
 		this->suite = this->cache->lookup(this->cache, session, id, &master);
 		if (this->suite)
 		{
-			select_cipher_suite(this, &this->suite, 1, KEY_ANY);
+			this->suite = select_cipher_suite(this, &this->suite, 1, KEY_ANY);
 			if (this->suite)
 			{
 				this->prf->set_key(this->prf, master);
@@ -1606,8 +1606,9 @@ METHOD(tls_crypto_t, resume_session, tls_cipher_suite_t,
 			}
 			chunk_clear(&master);
 		}
+		return this->suite;
 	}
-	return this->suite;
+	return 0;
 }
 
 METHOD(tls_crypto_t, get_session, chunk_t,