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

Add a return value to keymat_v1_t.get_hash()

Browse Source
This commit is contained in:
Martin Willi
2012-07-16 14:53:34 +02:00
parent bb1e0c59e1
commit e4c5c1d03e
4 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
+12 -4
View File
@@ -76,9 +76,13 @@ METHOD(authenticator_t, build, status_t,
this->dh->get_my_public_value(this->dh, &dh);
keymat = (keymat_v1_t*)this->ike_sa->get_keymat(this->ike_sa);
hash = keymat->get_hash(keymat, this->initiator, dh, this->dh_value,
if (!keymat->get_hash(keymat, this->initiator, dh, this->dh_value,
this->ike_sa->get_id(this->ike_sa), this->sa_payload,
this->id_payload);
this->id_payload, &hash))
{
free(dh.ptr);
return FAILED;
}
free(dh.ptr);
hash_payload = hash_payload_create(HASH_V1);
@@ -106,9 +110,13 @@ METHOD(authenticator_t, process, status_t,
this->dh->get_my_public_value(this->dh, &dh);
keymat = (keymat_v1_t*)this->ike_sa->get_keymat(this->ike_sa);
hash = keymat->get_hash(keymat, !this->initiator, this->dh_value, dh,
if (!keymat->get_hash(keymat, !this->initiator, this->dh_value, dh,
this->ike_sa->get_id(this->ike_sa), this->sa_payload,
this->id_payload);
this->id_payload, &hash))
{
free(dh.ptr);
return FAILED;
}
free(dh.ptr);
if (chunk_equals(hash, hash_payload->get_hash(hash_payload)))
{
src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
+13 -4
View File
@@ -96,9 +96,14 @@ METHOD(authenticator_t, build, status_t,
this->dh->get_my_public_value(this->dh, &dh);
keymat = (keymat_v1_t*)this->ike_sa->get_keymat(this->ike_sa);
hash = keymat->get_hash(keymat, this->initiator, dh, this->dh_value,
if (!keymat->get_hash(keymat, this->initiator, dh, this->dh_value,
this->ike_sa->get_id(this->ike_sa), this->sa_payload,
this->id_payload);
this->id_payload, &hash))
{
private->destroy(private);
free(dh.ptr);
return FAILED;
}
free(dh.ptr);
if (private->sign(private, scheme, hash, &sig))
@@ -149,9 +154,13 @@ METHOD(authenticator_t, process, status_t,
id = this->ike_sa->get_other_id(this->ike_sa);
this->dh->get_my_public_value(this->dh, &dh);
keymat = (keymat_v1_t*)this->ike_sa->get_keymat(this->ike_sa);
hash = keymat->get_hash(keymat, !this->initiator, this->dh_value, dh,
if (!keymat->get_hash(keymat, !this->initiator, this->dh_value, dh,
this->ike_sa->get_id(this->ike_sa), this->sa_payload,
this->id_payload);
this->id_payload, &hash))
{
free(dh.ptr);
return FAILED;
}
free(dh.ptr);
sig = sig_payload->get_hash(sig_payload);