denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separated cipherspec checking and switching, allowing us to defer the second

Browse Source
This commit is contained in:
Martin Willi
2011-12-31 13:14:49 +01:00
parent 7c0c2349a9
commit 4caa380625
4 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_peer.c
+19 -13
View File
@@ -1042,28 +1042,34 @@ METHOD(tls_handshake_t, build, status_t,
}
METHOD(tls_handshake_t, cipherspec_changed, bool,
private_tls_peer_t *this)
private_tls_peer_t *this, bool inbound)
{
if ((this->peer && this->state == STATE_VERIFY_SENT) ||
(!this->peer && this->state == STATE_KEY_EXCHANGE_SENT))
if (inbound)
{
this->crypto->change_cipher(this->crypto, FALSE);
this->state = STATE_CIPHERSPEC_CHANGED_OUT;
return TRUE;
return this->state == STATE_FINISHED_SENT;
}
else
{
if (this->peer)
{
return this->state == STATE_VERIFY_SENT;
}
return this->state == STATE_KEY_EXCHANGE_SENT;
}
return FALSE;
}
METHOD(tls_handshake_t, change_cipherspec, bool,
private_tls_peer_t *this)
METHOD(tls_handshake_t, change_cipherspec, void,
private_tls_peer_t *this, bool inbound)
{
if (this->state == STATE_FINISHED_SENT)
this->crypto->change_cipher(this->crypto, inbound);
if (inbound)
{
this->crypto->change_cipher(this->crypto, TRUE);
this->state = STATE_CIPHERSPEC_CHANGED_IN;
return TRUE;
}
return FALSE;
else
{
this->state = STATE_CIPHERSPEC_CHANGED_OUT;
}
}
METHOD(tls_handshake_t, finished, bool,