diff options
| author | Martin Willi <martin@revosec.ch> | 2012-07-06 10:47:20 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-07-16 14:53:34 +0200 |
| commit | 2baae8e3ea121a706b911f9dad3f1078ccf4905f (patch) | |
| tree | f7d2bc0827a4c6cc9598cc90cd6a0942e425d7b3 /src/libcharon/sa/ikev2/keymat_v2.c | |
| parent | bc4748832395a5db4b71cb38d37f75de0d6e9416 (diff) | |
| download | strongswan-2baae8e3ea121a706b911f9dad3f1078ccf4905f.tar.bz2 strongswan-2baae8e3ea121a706b911f9dad3f1078ccf4905f.tar.xz | |
Add a return value to keymat_v2_t.get_psk_sig()
Diffstat (limited to 'src/libcharon/sa/ikev2/keymat_v2.c')
| -rw-r--r-- | src/libcharon/sa/ikev2/keymat_v2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcharon/sa/ikev2/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c index 3e36b098f..86bc85967 100644 --- a/src/libcharon/sa/ikev2/keymat_v2.c +++ b/src/libcharon/sa/ikev2/keymat_v2.c @@ -606,11 +606,11 @@ METHOD(keymat_v2_t, get_auth_octets, chunk_t, #define IKEV2_KEY_PAD "Key Pad for IKEv2" #define IKEV2_KEY_PAD_LENGTH 17 -METHOD(keymat_v2_t, get_psk_sig, chunk_t, - private_keymat_v2_t *this, bool verify, chunk_t ike_sa_init, - chunk_t nonce, chunk_t secret, identification_t *id, char reserved[3]) +METHOD(keymat_v2_t, get_psk_sig, bool, + private_keymat_v2_t *this, bool verify, chunk_t ike_sa_init, chunk_t nonce, + chunk_t secret, identification_t *id, char reserved[3], chunk_t *sig) { - chunk_t key_pad, key, sig, octets; + chunk_t key_pad, key, octets; if (!secret.len) { /* EAP uses SK_p if no MSK has been established */ @@ -622,14 +622,14 @@ METHOD(keymat_v2_t, get_psk_sig, chunk_t, this->prf->set_key(this->prf, secret); this->prf->allocate_bytes(this->prf, key_pad, &key); this->prf->set_key(this->prf, key); - this->prf->allocate_bytes(this->prf, octets, &sig); + this->prf->allocate_bytes(this->prf, octets, sig); DBG4(DBG_IKE, "secret %B", &secret); DBG4(DBG_IKE, "prf(secret, keypad) %B", &key); - DBG3(DBG_IKE, "AUTH = prf(prf(secret, keypad), octets) %B", &sig); + DBG3(DBG_IKE, "AUTH = prf(prf(secret, keypad), octets) %B", sig); chunk_free(&octets); chunk_free(&key); - return sig; + return TRUE; } METHOD(keymat_t, destroy, void, |