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

Add a return value to prf_t.set_key()

Browse Source
This commit is contained in:
Martin Willi
2012-07-16 14:53:34 +02:00
parent ecc080b393
commit f3ca96b2bf
12 changed files with 92 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/keymat_v1.c
+25 -10
View File
@@ -240,7 +240,12 @@ static bool expand_skeyid_e(chunk_t skeyid_e, size_t key_size, prf_t *prf,
ka->len = key_size;
/* Ka = K1 | K2 | ..., K1 = prf(SKEYID_e, 0), K2 = prf(SKEYID_e, K1) ... */
prf->set_key(prf, skeyid_e);
if (!prf->set_key(prf, skeyid_e))
{
chunk_clear(ka);
chunk_clear(&skeyid_e);
return FALSE;
}
seed = octet_0;
for (i = 0; i < key_size; i += block_size)
{
@@ -434,8 +439,8 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
}
psk = shared_key->get_key(shared_key);
adjust_keylen(alg, &psk);
this->prf->set_key(this->prf, psk);
if (!this->prf->allocate_bytes(this->prf, nonces, &skeyid))
if (!this->prf->set_key(this->prf, psk) ||
!this->prf->allocate_bytes(this->prf, nonces, &skeyid))
{
chunk_clear(&g_xy);
return FALSE;
@@ -451,8 +456,8 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
case AUTH_HYBRID_INIT_RSA:
case AUTH_HYBRID_RESP_RSA:
{
this->prf->set_key(this->prf, nonces);
if (!this->prf->allocate_bytes(this->prf, g_xy, &skeyid))
if (!this->prf->set_key(this->prf, nonces) ||
!this->prf->allocate_bytes(this->prf, g_xy, &skeyid))
{
chunk_clear(&g_xy);
return FALSE;
@@ -467,11 +472,11 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
}
adjust_keylen(alg, &skeyid);
DBG4(DBG_IKE, "SKEYID %B", &skeyid);
this->prf->set_key(this->prf, skeyid);
/* SKEYID_d = prf(SKEYID, g^xy | CKY-I | CKY-R | 0) */
data = chunk_cat("cccc", g_xy, spi_i, spi_r, octet_0);
if (!this->prf->allocate_bytes(this->prf, data, &this->skeyid_d))
if (!this->prf->set_key(this->prf, skeyid) ||
!this->prf->allocate_bytes(this->prf, data, &this->skeyid_d))
{
chunk_clear(&g_xy);
chunk_clear(&data);
@@ -525,7 +530,11 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
chunk_clear(&skeyid);
return FALSE;
}
this->prf_auth->set_key(this->prf_auth, skeyid);
if (!this->prf_auth->set_key(this->prf_auth, skeyid))
{
chunk_clear(&skeyid);
return FALSE;
}
chunk_clear(&skeyid);
this->aead = create_aead(proposal, this->prf, skeyid_e);
@@ -628,7 +637,10 @@ METHOD(keymat_v1_t, derive_child_keys, bool,
}
/* KEYMAT = prf+(SKEYID_d, [ g(qm)^xy | ] protocol | SPI | Ni_b | Nr_b) */
this->prf->set_key(this->prf, this->skeyid_d);
if (!this->prf->set_key(this->prf, this->skeyid_d))
{
return FALSE;
}
protocol = proposal->get_protocol(proposal);
if (dh)
{
@@ -918,7 +930,10 @@ METHOD(keymat_v1_t, get_hash_phase2, bool,
default:
return FALSE;
}
this->prf->set_key(this->prf, this->skeyid_a);
if (!this->prf->set_key(this->prf, this->skeyid_a))
{
return FALSE;
}
if (add_message)
{
generator_t *generator;
src/libcharon/sa/ikev2/keymat_v2.c
+16 -13
View File
@@ -322,10 +322,10 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
if (rekey_function == PRF_UNDEFINED) /* not rekeying */
{
/* SKEYSEED = prf(Ni | Nr, g^ir) */
this->prf->set_key(this->prf, fixed_nonce);
if (this->prf->allocate_bytes(this->prf, secret, &skeyseed))
if (this->prf->set_key(this->prf, fixed_nonce) &&
this->prf->allocate_bytes(this->prf, secret, &skeyseed) &&
this->prf->set_key(this->prf, skeyseed))
{
this->prf->set_key(this->prf, skeyseed);
prf_plus = prf_plus_create(this->prf, TRUE, prf_plus_seed);
}
}
@@ -344,10 +344,10 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
return FALSE;
}
secret = chunk_cat("mc", secret, full_nonce);
rekey_prf->set_key(rekey_prf, rekey_skd);
if (rekey_prf->allocate_bytes(rekey_prf, secret, &skeyseed))
if (rekey_prf->set_key(rekey_prf, rekey_skd) &&
rekey_prf->allocate_bytes(rekey_prf, secret, &skeyseed) &&
rekey_prf->set_key(rekey_prf, skeyseed))
{
rekey_prf->set_key(rekey_prf, skeyseed);
prf_plus = prf_plus_create(rekey_prf, TRUE, prf_plus_seed);
}
}
@@ -536,7 +536,10 @@ METHOD(keymat_v2_t, derive_child_keys, bool,
int_size /= 8;
}
this->prf->set_key(this->prf, this->skd);
if (!this->prf->set_key(this->prf, this->skd))
{
return FALSE;
}
prf_plus = prf_plus_create(this->prf, TRUE, seed);
if (!prf_plus)
{
@@ -596,8 +599,8 @@ METHOD(keymat_v2_t, get_auth_octets, bool,
DBG3(DBG_IKE, "IDx' %B", &idx);
DBG3(DBG_IKE, "SK_p %B", &skp);
this->prf->set_key(this->prf, skp);
if (!this->prf->allocate_bytes(this->prf, idx, &chunk))
if (!this->prf->set_key(this->prf, skp) ||
!this->prf->allocate_bytes(this->prf, idx, &chunk))
{
return FALSE;
}
@@ -628,14 +631,14 @@ METHOD(keymat_v2_t, get_psk_sig, bool,
}
/* AUTH = prf(prf(Shared Secret,"Key Pad for IKEv2"), <msg octets>) */
key_pad = chunk_create(IKEV2_KEY_PAD, IKEV2_KEY_PAD_LENGTH);
this->prf->set_key(this->prf, secret);
if (!this->prf->allocate_bytes(this->prf, key_pad, &key))
if (!this->prf->set_key(this->prf, secret) ||
!this->prf->allocate_bytes(this->prf, key_pad, &key))
{
chunk_free(&octets);
return FALSE;
}
this->prf->set_key(this->prf, key);
if (!this->prf->allocate_bytes(this->prf, octets, sig))
if (!this->prf->set_key(this->prf, key) ||
!this->prf->allocate_bytes(this->prf, octets, sig))
{
chunk_free(&key);
chunk_free(&octets);
src/libsimaka/simaka_crypto.c
+12 -3
View File
@@ -129,7 +129,10 @@ METHOD(simaka_crypto_t, derive_keys_full, bool,
DBG3(DBG_LIB, "MK %B", mk);
/* K_encr | K_auth | MSK | EMSK = prf() | prf() | prf() | prf() */
this->prf->set_key(this->prf, *mk);
if (this->prf->set_key(this->prf, *mk))
{
return FALSE;
}
str = chunk_alloca(this->prf->get_block_size(this->prf) * 3);
for (i = 0; i < 3; i++)
{
@@ -167,7 +170,10 @@ METHOD(simaka_crypto_t, derive_keys_reauth, bool,
int i;
/* K_encr | K_auth = prf() | prf() */
this->prf->set_key(this->prf, mk);
if (!this->prf->set_key(this->prf, mk))
{
return FALSE;
}
str = chunk_alloca(this->prf->get_block_size(this->prf) * 2);
for (i = 0; i < 2; i++)
{
@@ -207,7 +213,10 @@ METHOD(simaka_crypto_t, derive_keys_reauth_msk, bool,
this->hasher->get_hash(this->hasher, mk, xkey);
/* MSK | EMSK = prf() | prf() | prf() | prf() */
this->prf->set_key(this->prf, chunk_create(xkey, sizeof(xkey)));
if (!this->prf->set_key(this->prf, chunk_create(xkey, sizeof(xkey))))
{
return FALSE;
}
str = chunk_alloca(this->prf->get_block_size(this->prf) * 2);
for (i = 0; i < 2; i++)
{
src/libstrongswan/crypto/crypto_tester.c
+12 -3
View File
@@ -843,7 +843,10 @@ METHOD(crypto_tester_t, test_prf, bool,
failed = FALSE;
key = chunk_create(vector->key, vector->key_size);
prf->set_key(prf, key);
if (!prf->set_key(prf, key))
{
failed = TRUE;
}
/* allocated bytes */
seed = chunk_create(vector->seed, vector->len);
@@ -863,7 +866,10 @@ METHOD(crypto_tester_t, test_prf, bool,
memset(out.ptr, 0, out.len);
if (vector->stateful)
{
prf->set_key(prf, key);
if (!prf->set_key(prf, key))
{
failed = TRUE;
}
}
if (!prf->get_bytes(prf, seed, out.ptr))
{
@@ -879,7 +885,10 @@ METHOD(crypto_tester_t, test_prf, bool,
memset(out.ptr, 0, out.len);
if (vector->stateful)
{
prf->set_key(prf, key);
if (!prf->set_key(prf, key))
{
failed = TRUE;
}
}
if (!prf->allocate_bytes(prf, chunk_create(seed.ptr, 1), NULL) ||
!prf->get_bytes(prf, chunk_create(seed.ptr + 1, 1), NULL) ||
src/libstrongswan/crypto/prfs/mac_prf.c
+2 -1
View File
@@ -70,10 +70,11 @@ METHOD(prf_t, get_key_size, size_t,
return this->mac->get_mac_size(this->mac);
}
METHOD(prf_t, set_key, void,
METHOD(prf_t, set_key, bool,
private_prf_t *this, chunk_t key)
{
this->mac->set_key(this->mac, key);
return TRUE;
}
METHOD(prf_t, destroy, void,
src/libstrongswan/crypto/prfs/prf.h
+3 -1
View File
@@ -113,8 +113,10 @@ struct prf_t {
* Set the key for this prf_t object.
*
* @param key key to set
* @return TRUE if key set successfully
*/
void (*set_key) (prf_t *this, chunk_t key);
__attribute__((warn_unused_result))
bool (*set_key) (prf_t *this, chunk_t key);
/**
* Destroys a prf object.
src/libstrongswan/plugins/af_alg/af_alg_prf.c
+2 -1
View File
@@ -135,7 +135,7 @@ METHOD(prf_t, get_key_size, size_t,
return this->block_size;
}
METHOD(prf_t, set_key, void,
METHOD(prf_t, set_key, bool,
private_af_alg_prf_t *this, chunk_t key)
{
char buf[this->block_size];
@@ -159,6 +159,7 @@ METHOD(prf_t, set_key, void,
}
}
this->ops->set_key(this->ops, key);
return TRUE;
}
METHOD(prf_t, destroy, void,
src/libstrongswan/plugins/fips_prf/fips_prf.c
+4 -3
View File
@@ -160,11 +160,12 @@ METHOD(prf_t, get_key_size, size_t,
return this->b;
}
METHOD(prf_t, set_key, void,
METHOD(prf_t, set_key, bool,
private_fips_prf_t *this, chunk_t key)
{
/* save key as "key mod 2^b" */
chunk_mod(this->b, key, this->key);
return TRUE;
}
/**
@@ -189,8 +190,8 @@ static bool g_sha1(private_fips_prf_t *this, chunk_t c, u_int8_t res[])
}
/* use the keyed hasher, but use an empty key to use SHA1 IV */
this->keyed_prf->set_key(this->keyed_prf, chunk_empty);
if (!this->keyed_prf->get_bytes(this->keyed_prf, c, res))
if (!this->keyed_prf->set_key(this->keyed_prf, chunk_empty) ||
!this->keyed_prf->get_bytes(this->keyed_prf, c, res))
{
return FALSE;
}
src/libstrongswan/plugins/openssl/openssl_sha1_prf.c
+6 -1
View File
@@ -77,11 +77,15 @@ METHOD(prf_t, get_key_size, size_t,
return HASH_SIZE_SHA1;
}
METHOD(prf_t, set_key, void,
METHOD(prf_t, set_key, bool,
private_openssl_sha1_prf_t *this, chunk_t key)
{
SHA1_Init(&this->ctx);
if (key.len % 4)
{
return FALSE;
}
if (key.len >= 4)
{
this->ctx.h0 ^= untoh32(key.ptr);
@@ -102,6 +106,7 @@ METHOD(prf_t, set_key, void,
{
this->ctx.h4 ^= untoh32(key.ptr + 16);
}
return TRUE;
}
METHOD(prf_t, destroy, void,
src/libstrongswan/plugins/pkcs8/pkcs8_builder.c
+4 -1
View File
@@ -225,7 +225,10 @@ static bool pbkdf2(prf_t *prf, chunk_t password, chunk_t salt,
size_t blocks;
u_int32_t i = 0, *ni;
prf->set_key(prf, password);
if (!prf->set_key(prf, password))
{
return FALSE;
}
block.len = prf->get_block_size(prf);
blocks = (key.len - 1) / block.len + 1;
src/libstrongswan/plugins/sha1/sha1_prf.c
+2 -1
View File
@@ -94,7 +94,7 @@ METHOD(prf_t, get_key_size, size_t,
return sizeof(this->hasher->state);
}
METHOD(prf_t, set_key, void,
METHOD(prf_t, set_key, bool,
private_sha1_prf_t *this, chunk_t key)
{
int i, rounds;
@@ -106,6 +106,7 @@ METHOD(prf_t, set_key, void,
{
this->hasher->state[i] ^= htonl(iv[i]);
}
return TRUE;
}
METHOD(prf_t, destroy, void,
src/libtls/tls_prf.c
+4 -5
View File
@@ -36,8 +36,7 @@ struct private_tls_prf12_t {
METHOD(tls_prf_t, set_key12, bool,
private_tls_prf12_t *this, chunk_t key)
{
this->prf->set_key(this->prf, key);
return TRUE;
return this->prf->set_key(this->prf, key);
}
/**
@@ -145,9 +144,9 @@ METHOD(tls_prf_t, set_key10, bool,
{
size_t len = key.len / 2 + key.len % 2;
this->md5->set_key(this->md5, chunk_create(key.ptr, len));
this->sha1->set_key(this->sha1, chunk_create(key.ptr + key.len - len, len));
return TRUE;
return this->md5->set_key(this->md5, chunk_create(key.ptr, len)) &&
this->sha1->set_key(this->sha1, chunk_create(key.ptr + key.len - len,
len));
}
METHOD(tls_prf_t, get_bytes10, bool,