aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2015-01-29 11:12:28 +0100
committerMartin Willi <martin@revosec.ch>2015-03-03 14:08:00 +0100
commitaba5b76ce170deb486f7a1eb36282b3458545fba (patch)
tree523bd4fd71be64cf115b2eb860b1dd38a5edc6fa
parent0c608316ddae4be1b65a3a00903971dbedef720a (diff)
downloadstrongswan-aba5b76ce170deb486f7a1eb36282b3458545fba.tar.bz2
strongswan-aba5b76ce170deb486f7a1eb36282b3458545fba.tar.xz
libtls: Merge trustchain auth verification details done during TLS handhsake
-rw-r--r--src/libtls/tls_peer.c1
-rw-r--r--src/libtls/tls_server.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libtls/tls_peer.c b/src/libtls/tls_peer.c
index a95b40f55..1bee436c4 100644
--- a/src/libtls/tls_peer.c
+++ b/src/libtls/tls_peer.c
@@ -324,6 +324,7 @@ static public_key_t *find_public_key(private_tls_peer_t *this)
while (enumerator->enumerate(enumerator, &current, &auth))
{
public = current->get_ref(current);
+ this->server_auth->merge(this->server_auth, auth, FALSE);
break;
}
enumerator->destroy(enumerator);
diff --git a/src/libtls/tls_server.c b/src/libtls/tls_server.c
index aeb5a714f..a861a267a 100644
--- a/src/libtls/tls_server.c
+++ b/src/libtls/tls_server.c
@@ -551,6 +551,7 @@ static status_t process_cert_verify(private_tls_server_t *this,
sig->destroy(sig);
if (verified)
{
+ this->peer_auth->merge(this->peer_auth, auth, FALSE);
break;
}
DBG1(DBG_TLS, "signature verification failed, trying another key");