diff options
| author | Robert Sloan <varomodt@google.com> | 2019-04-17 13:17:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-17 13:17:34 -0700 |
| commit | 2669718082106ff65c13a73fc6f058e0713167b3 (patch) | |
| tree | 5bfdfa9db8642d577ef86e52257844b934be87c4 /src/crypto/fipsmodule/aes/aes.c | |
| parent | 62c374e4170390cb3ca19cef283a8dc33c95211a (diff) | |
| parent | f63bd1f440905963647c68a896db0c85e8914d11 (diff) | |
| download | boringssl-2669718082106ff65c13a73fc6f058e0713167b3.tar.gz | |
external/boringssl: Sync to c9827e073f64e353c4891ecc2c73721882543ee0.
am: f63bd1f440
Change-Id: I3b6a5db1dab391cd490dd40dfba716bd48359b39
Diffstat (limited to 'src/crypto/fipsmodule/aes/aes.c')
| -rw-r--r-- | src/crypto/fipsmodule/aes/aes.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/crypto/fipsmodule/aes/aes.c b/src/crypto/fipsmodule/aes/aes.c index 8a1ca31d..48d60eeb 100644 --- a/src/crypto/fipsmodule/aes/aes.c +++ b/src/crypto/fipsmodule/aes/aes.c @@ -834,6 +834,9 @@ void AES_decrypt(const uint8_t *in, uint8_t *out, const AES_KEY *key) { } int AES_set_encrypt_key(const uint8_t *key, unsigned bits, AES_KEY *aeskey) { + if (bits != 128 && bits != 192 && bits != 256) { + return -2; + } if (hwaes_capable()) { return aes_hw_set_encrypt_key(key, bits, aeskey); } else if (vpaes_capable()) { @@ -844,6 +847,9 @@ int AES_set_encrypt_key(const uint8_t *key, unsigned bits, AES_KEY *aeskey) { } int AES_set_decrypt_key(const uint8_t *key, unsigned bits, AES_KEY *aeskey) { + if (bits != 128 && bits != 192 && bits != 256) { + return -2; + } if (hwaes_capable()) { return aes_hw_set_decrypt_key(key, bits, aeskey); } else if (vpaes_capable()) { |