diff options
| author | Martin Willi <martin@revosec.ch> | 2012-07-05 17:10:17 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-07-16 14:53:32 +0200 |
| commit | e2ed7bfd22d82617aca4eb91ac4ce5a35cda22d4 (patch) | |
| tree | 204fe43b5b5d5a1efa0b41ba55206fb8179fd86b /src/libcharon/encoding/payloads/encryption_payload.c | |
| parent | 0f236aacb5ae9908ccecd6a87cb755e3e534f194 (diff) | |
| download | strongswan-e2ed7bfd22d82617aca4eb91ac4ce5a35cda22d4.tar.bz2 strongswan-e2ed7bfd22d82617aca4eb91ac4ce5a35cda22d4.tar.xz | |
Add a return value to aead_t.encrypt()
Diffstat (limited to 'src/libcharon/encoding/payloads/encryption_payload.c')
| -rw-r--r-- | src/libcharon/encoding/payloads/encryption_payload.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/libcharon/encoding/payloads/encryption_payload.c b/src/libcharon/encoding/payloads/encryption_payload.c index 096079ad7..842e516d7 100644 --- a/src/libcharon/encoding/payloads/encryption_payload.c +++ b/src/libcharon/encoding/payloads/encryption_payload.c @@ -367,7 +367,11 @@ METHOD(encryption_payload_t, encrypt, bool, DBG3(DBG_ENC, "padding %B", &padding); DBG3(DBG_ENC, "assoc %B", &assoc); - this->aead->encrypt(this->aead, crypt, assoc, iv, NULL); + if (!this->aead->encrypt(this->aead, crypt, assoc, iv, NULL)) + { + free(assoc.ptr); + return FALSE; + } DBG3(DBG_ENC, "encrypted %B", &crypt); DBG3(DBG_ENC, "ICV %B", &icv); @@ -410,7 +414,11 @@ METHOD(encryption_payload_t, encrypt_v1, bool, DBG3(DBG_ENC, "plain %B", &plain); DBG3(DBG_ENC, "padding %B", &padding); - this->aead->encrypt(this->aead, this->encrypted, chunk_empty, iv, NULL); + if (!this->aead->encrypt(this->aead, this->encrypted, chunk_empty, iv, NULL)) + { + chunk_free(&iv); + return FALSE; + } chunk_free(&iv); DBG3(DBG_ENC, "encrypted %B", &this->encrypted); |