diff options
author | Jerome Forissier | 2018-06-05 11:44:42 -0500 |
---|---|---|
committer | Jérôme Forissier | 2018-06-07 08:52:00 -0500 |
commit | bf9009eba6eed881fb3dbb703265cbf43a1229cb (patch) | |
tree | de3a25b6d9ce7d152fd31969ae594de39ade4fdb | |
parent | 0780ad48e6565511844af0775007a712ab0a0267 (diff) | |
download | ti-optee-test-bf9009eba6eed881fb3dbb703265cbf43a1229cb.tar.gz ti-optee-test-bf9009eba6eed881fb3dbb703265cbf43a1229cb.tar.xz ti-optee-test-bf9009eba6eed881fb3dbb703265cbf43a1229cb.zip |
regression: 4003: use bigger plain text in AES CTR test
The AES CTR test added in the parent commit results in the accelerated
crypto code being called with 3 blocks of data (48 bytes), which revealed
a bug in the 32-bit version of ce_aes_ctr_encrypt() [1].
Add some more data to exercise a similar loop in the 64-bit version of
ce_aes_ctr_encrypt(). The loop deals with 4 blocks of data.
Link: [1] https://github.com/OP-TEE/optee_os/issues/2305
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
-rw-r--r-- | host/xtest/regression_4000.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/host/xtest/regression_4000.c b/host/xtest/regression_4000.c index 906ebf9..023582b 100644 --- a/host/xtest/regression_4000.c +++ b/host/xtest/regression_4000.c | |||
@@ -1805,6 +1805,8 @@ static const uint8_t ciph_data_in5[] = { | |||
1805 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, | 1805 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, |
1806 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, | 1806 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, |
1807 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, | 1807 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, |
1808 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, | ||
1809 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, | ||
1808 | 0x01, 0x01, 0x01 | 1810 | 0x01, 0x01, 0x01 |
1809 | }; | 1811 | }; |
1810 | 1812 | ||
@@ -1882,7 +1884,9 @@ static const uint8_t ciph_data_aes_ctr_out5[] = { | |||
1882 | 0x29, 0xda, 0xd5, 0x56, 0x3f, 0x46, 0xac, 0xca, | 1884 | 0x29, 0xda, 0xd5, 0x56, 0x3f, 0x46, 0xac, 0xca, |
1883 | 0x37, 0xe7, 0x77, 0x36, 0xbc, 0x76, 0x39, 0x57, | 1885 | 0x37, 0xe7, 0x77, 0x36, 0xbc, 0x76, 0x39, 0x57, |
1884 | 0xaa, 0x67, 0x1b, 0x2a, 0xe6, 0x36, 0x57, 0x6d, | 1886 | 0xaa, 0x67, 0x1b, 0x2a, 0xe6, 0x36, 0x57, 0x6d, |
1885 | 0x2a, 0xb8, 0x77 | 1887 | 0x2a, 0xb8, 0x77, 0x41, 0xc2, 0x4e, 0x4f, 0x27, |
1888 | 0x4c, 0x34, 0x7a, 0x01, 0x6a, 0xda, 0x75, 0x75, | ||
1889 | 0x3e, 0x68, 0xb2 | ||
1886 | }; | 1890 | }; |
1887 | 1891 | ||
1888 | static const uint8_t ciph_data_aes_cbc_vect1_key[] = { | 1892 | static const uint8_t ciph_data_aes_cbc_vect1_key[] = { |