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

Add a return value to crypter_t.set_key()

Browse Source
This commit is contained in:
Martin Willi
2012-07-16 14:53:38 +02:00
parent 3b96189a2a
commit ce73fc19db
23 changed files with 87 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/aead.c
+2 -7
View File
@@ -141,13 +141,8 @@ METHOD(aead_t, set_key, bool,
chunk_split(key, "mm", this->signer->get_key_size(this->signer), &sig,
this->crypter->get_key_size(this->crypter), &enc);
if (!this->signer->set_key(this->signer, sig))
{
return FALSE;
}
this->crypter->set_key(this->crypter, enc);
return TRUE;
return this->signer->set_key(this->signer, sig) &&
this->crypter->set_key(this->crypter, enc);
}
METHOD(aead_t, destroy, void,
src/libstrongswan/crypto/crypters/crypter.h
+3 -1
View File
@@ -147,8 +147,10 @@ struct crypter_t {
* The length of the key must match get_key_size().
*
* @param key key to set
* @return TRUE if key set successfully
*/
void (*set_key) (crypter_t *this, chunk_t key);
__attribute__((warn_unused_result))
bool (*set_key) (crypter_t *this, chunk_t key);
/**
* Destroys a crypter_t object.
src/libstrongswan/crypto/crypto_tester.c
+8 -2
View File
@@ -151,7 +151,10 @@ static u_int bench_crypter(private_crypto_tester_t *this,
memset(iv, 0x56, sizeof(iv));
memset(key, 0x12, sizeof(key));
crypter->set_key(crypter, chunk_from_thing(key));
if (!crypter->set_key(crypter, chunk_from_thing(key)))
{
return 0;
}
buf = chunk_alloc(this->bench_size);
memset(buf.ptr, 0x34, buf.len);
@@ -214,7 +217,10 @@ METHOD(crypto_tester_t, test_crypter, bool,
tested++;
key = chunk_create(vector->key, crypter->get_key_size(crypter));
crypter->set_key(crypter, key);
if (!crypter->set_key(crypter, key))
{
failed = TRUE;
}
iv = chunk_create(vector->iv, crypter->get_iv_size(crypter));
/* allocated encryption */
src/libstrongswan/crypto/pkcs7.c
+4 -4
View File
@@ -638,8 +638,8 @@ end:
success = FALSE;
/* decrypt the content */
crypter->set_key(crypter, symmetric_key);
if (!crypter->decrypt(crypter, encrypted_content, iv, &this->data))
if (!crypter->set_key(crypter, symmetric_key) ||
!crypter->decrypt(crypter, encrypted_content, iv, &this->data))
{
success = FALSE;
goto failed;
@@ -834,8 +834,8 @@ METHOD(pkcs7_t, build_envelopedData, bool,
DBG3(DBG_LIB, " padded unencrypted data: %B", &in);
/* symmetric encryption of data object */
crypter->set_key(crypter, symmetricKey);
if (!crypter->encrypt(crypter, in, iv, &out))
if (!crypter->set_key(crypter, symmetricKey) ||
!crypter->encrypt(crypter, in, iv, &out))
{
crypter->destroy(crypter);
chunk_clear(&in);
src/libstrongswan/plugins/aes/aes_crypter.c
+2 -1
View File
@@ -1430,7 +1430,7 @@ METHOD(crypter_t, get_key_size, size_t,
return this->key_size;
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_aes_crypter_t *this, chunk_t key)
{
u_int32_t *kf, *kt, rci, f = 0;
@@ -1515,6 +1515,7 @@ METHOD(crypter_t, set_key, void,
}
cpy(kt, kf);
}
return TRUE;
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/af_alg/af_alg_crypter.c
+2 -1
View File
@@ -179,10 +179,11 @@ METHOD(crypter_t, get_key_size, size_t,
return this->keymat_size;
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_af_alg_crypter_t *this, chunk_t key)
{
this->ops->set_key(this->ops, key);
return TRUE;
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/blowfish/blowfish_crypter.c
+2 -1
View File
@@ -155,10 +155,11 @@ METHOD(crypter_t, get_key_size, size_t,
return this->key_size;
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_blowfish_crypter_t *this, chunk_t key)
{
BF_set_key(&this->schedule, key.len , key.ptr);
return TRUE;
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/ccm/ccm_aead.c
+1 -2
View File
@@ -316,8 +316,7 @@ METHOD(aead_t, set_key, bool,
{
memcpy(this->salt, key.ptr + key.len - SALT_SIZE, SALT_SIZE);
key.len -= SALT_SIZE;
this->crypter->set_key(this->crypter, key);
return TRUE;
return this->crypter->set_key(this->crypter, key);
}
METHOD(aead_t, destroy, void,
src/libstrongswan/plugins/cmac/cmac.c
+2 -2
View File
@@ -279,8 +279,8 @@ METHOD(mac_t, set_key, bool,
memset(iv.ptr, 0, iv.len);
l = chunk_alloca(this->b);
memset(l.ptr, 0, l.len);
this->k->set_key(this->k, resized);
if (!this->k->encrypt(this->k, l, iv, NULL))
if (!this->k->set_key(this->k, resized) ||
!this->k->encrypt(this->k, l, iv, NULL))
{
return FALSE;
}
src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.c
+2 -2
View File
@@ -113,13 +113,13 @@ METHOD(crypter_t, get_key_size, size_t,
+ sizeof(this->state.nonce);
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_ctr_ipsec_crypter_t *this, chunk_t key)
{
memcpy(this->state.nonce, key.ptr + key.len - sizeof(this->state.nonce),
sizeof(this->state.nonce));
key.len -= sizeof(this->state.nonce);
this->crypter->set_key(this->crypter, key);
return this->crypter->set_key(this->crypter, key);
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/des/des_crypter.c
+4 -2
View File
@@ -1541,18 +1541,20 @@ METHOD(crypter_t, get_key_size, size_t,
return this->key_size;
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_des_crypter_t *this, chunk_t key)
{
des_set_key((des_cblock*)(key.ptr), &this->ks);
return TRUE;
}
METHOD(crypter_t, set_key3, void,
METHOD(crypter_t, set_key3, bool,
private_des_crypter_t *this, chunk_t key)
{
des_set_key((des_cblock*)(key.ptr) + 0, &this->ks3[0]);
des_set_key((des_cblock*)(key.ptr) + 1, &this->ks3[1]);
des_set_key((des_cblock*)(key.ptr) + 2, &this->ks3[2]);
return TRUE;
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/gcm/gcm_aead.c
+2 -2
View File
@@ -348,8 +348,8 @@ METHOD(aead_t, set_key, bool,
{
memcpy(this->salt, key.ptr + key.len - SALT_SIZE, SALT_SIZE);
key.len -= SALT_SIZE;
this->crypter->set_key(this->crypter, key);
return create_h(this, this->h);
return this->crypter->set_key(this->crypter, key) &&
create_h(this, this->h);
}
METHOD(aead_t, destroy, void,
src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c
+2 -2
View File
@@ -141,7 +141,7 @@ METHOD(crypter_t, get_key_size, size_t,
return len;
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_gcrypt_crypter_t *this, chunk_t key)
{
if (this->ctr_mode)
@@ -151,7 +151,7 @@ METHOD(crypter_t, set_key, void,
sizeof(this->ctr.nonce));
key.len -= sizeof(this->ctr.nonce);
}
gcry_cipher_setkey(this->h, key.ptr, key.len);
return gcry_cipher_setkey(this->h, key.ptr, key.len) == 0;
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/openssl/openssl_crypter.c
+2 -1
View File
@@ -144,10 +144,11 @@ METHOD(crypter_t, get_key_size, size_t,
return this->key.len;
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_openssl_crypter_t *this, chunk_t key)
{
memcpy(this->key.ptr, key.ptr, min(key.len, this->key.len));
return TRUE;
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/padlock/padlock_aes_crypter.c
+2 -1
View File
@@ -141,10 +141,11 @@ METHOD(crypter_t, get_key_size, size_t,
return this->key.len;
}
METHOD(crypter_t, set_key, void,
METHOD(crypter_t, set_key, bool,
private_padlock_aes_crypter_t *this, chunk_t key)
{
memcpy(this->key.ptr, key.ptr, min(key.len, this->key.len));
return TRUE;
}
METHOD(crypter_t, destroy, void,
src/libstrongswan/plugins/pem/pem_builder.c
+2 -2
View File
@@ -125,7 +125,6 @@ static status_t pem_decrypt(chunk_t *blob, encryption_algorithm_t alg,
encryption_algorithm_names, alg);
return NOT_SUPPORTED;
}
crypter->set_key(crypter, key);
if (iv.len != crypter->get_iv_size(crypter) ||
blob->len % crypter->get_block_size(crypter))
@@ -134,7 +133,8 @@ static status_t pem_decrypt(chunk_t *blob, encryption_algorithm_t alg,
DBG1(DBG_ASN, " data size is not multiple of block size");
return PARSE_ERROR;
}
if (!crypter->decrypt(crypter, *blob, iv, &decrypted))
if (!crypter->set_key(crypter, key) ||
!crypter->decrypt(crypter, *blob, iv, &decrypted))
{
crypter->destroy(crypter);
return FAILED;
src/libstrongswan/plugins/pkcs8/pkcs8_builder.c
+2 -3
View File
@@ -168,9 +168,8 @@ static private_key_t *decrypt_private_key(chunk_t blob,
{
continue;
}
crypter->set_key(crypter, key);
if (!crypter->decrypt(crypter, blob, iv, &decrypted))
if (!crypter->set_key(crypter, key) ||
!crypter->decrypt(crypter, blob, iv, &decrypted))
{
continue;
}
src/libstrongswan/plugins/xcbc/xcbc.c
+5 -6
View File
@@ -257,17 +257,16 @@ METHOD(mac_t, set_key, bool,
memset(this->k2, 0x02, this->b);
memset(this->k3, 0x03, this->b);
this->k1->set_key(this->k1, lengthened);
if (!this->k1->encrypt(this->k1, chunk_create(this->k2, this->b), iv, NULL) ||
if (!this->k1->set_key(this->k1, lengthened) ||
!this->k1->encrypt(this->k1, chunk_create(this->k2, this->b), iv, NULL) ||
!this->k1->encrypt(this->k1, chunk_create(this->k3, this->b), iv, NULL) ||
!this->k1->encrypt(this->k1, k1, iv, NULL))
!this->k1->encrypt(this->k1, k1, iv, NULL) ||
!this->k1->set_key(this->k1, k1))
{
memwipe(k1.ptr, k1.len);
return FALSE;
}
this->k1->set_key(this->k1, k1);
memwipe(k1.ptr, k1.len);
return TRUE;
}