From: Martin Willi <martin@revosec.ch>
Date: Fri, 27 Mar 2015 15:06:21 +0000 (+0100)
Subject: af-alg: Reset hmac/xcbc state before doing set_key()
X-Git-Tag: 5.3.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4075e9d7a4bf814f710237238a2bd8367a24ffa0;p=thirdparty%2Fstrongswan.git

af-alg: Reset hmac/xcbc state before doing set_key()
---

diff --git a/src/libstrongswan/plugins/af_alg/af_alg_prf.c b/src/libstrongswan/plugins/af_alg/af_alg_prf.c
index 720738a840..2b7d51376a 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_prf.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_prf.c
@@ -139,6 +139,7 @@ METHOD(prf_t, set_key, bool,
 {
 	char buf[this->block_size];
 
+	this->ops->reset(this->ops);
 	if (this->xcbc)
 	{
 		/* The kernel currently does not support variable length XCBC keys,
diff --git a/src/libstrongswan/plugins/af_alg/af_alg_signer.c b/src/libstrongswan/plugins/af_alg/af_alg_signer.c
index 6ee3806333..9ad01103ad 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_signer.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_signer.c
@@ -156,6 +156,7 @@ METHOD(signer_t, get_block_size, size_t,
 METHOD(signer_t, set_key, bool,
 	private_af_alg_signer_t *this, chunk_t key)
 {
+	this->ops->reset(this->ops);
 	return this->ops->set_key(this->ops, key);
 }