Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aesv8-armx.pl: Avoid buffer overread in AES-XTS decryption #970

Merged
merged 3 commits into from
Apr 21, 2023
Merged

aesv8-armx.pl: Avoid buffer overread in AES-XTS decryption #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be03462
aesv8-armx.pl: Avoid buffer overread in AES-XTS decryption
nebeid Apr 20, 2023
9a6db9e
redisabling valgrind for now. It doesn't recognise reading MIDR_EL1.
nebeid Apr 21, 2023
36fbc0b
Merge branch 'main' into xts-aarch64-buffer-overread
nebeid Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion crypto/fipsmodule/aes/asm/aesv8-armx.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2109,7 +2109,7 @@ ()
.align 4
.Lxts_dec_tail4x:
add $inp,$inp,#16
vld1.32 {$dat0},[$inp],#16
tst $tailcnt,#0xf
veor $tmp1,$dat1,$tmp0
vst1.8 {$tmp1},[$out],#16
veor $tmp2,$dat2,$tmp2
Expand All @@ -2118,6 +2118,8 @@ ()
veor $tmp4,$dat4,$tmp4
vst1.8 {$tmp3-$tmp4},[$out],#32

b.eq .Lxts_dec_abort
vld1.32 {$dat0},[$inp],#16
b .Lxts_done
.align 4
.Lxts_outer_dec_tail:
Expand Down
145 changes: 140 additions & 5 deletions crypto/fipsmodule/modes/xts_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ static const XTSTestCase kXTSTestCases[] = {
// the AArch64 implementation produces the same output.
// The plaintext lengths were chosen such that one or more vectors
// exercise a certain path in the assembly code.
// len = 44 blocks = 2 blocks + 12 bytes
// len = 44 bytes = 2 blocks + 12 bytes
{
"1338d7d3d66137abf00c8f33050cff7e0a6fa10ff2e2bd860119dfa68ee815c4"
"4aa1bfc76f2e084d81b862c05aae29711bf167fff7432a7b9c5899ab069fff0f",
Expand Down Expand Up @@ -351,6 +351,20 @@ static const XTSTestCase kXTSTestCases[] = {
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1ffe2f16cfa1900d7ae2b67f0e6f43b71",
},
// len = 100 bytes = 6 blocks + 4 bytes
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
"bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0",
"9a785634120000000000000000000000",
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
"202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"
"404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"
"60616263",
"c30ca8f2ed57307edc87e544867ac888348c208928d7406269954551cb627b5b"
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1aad32ff4d83b0af3f6a176025bd1321b"
"ffe2f16c",
},
// len = 128 bytes = 8 blocks
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
Expand Down Expand Up @@ -381,7 +395,6 @@ static const XTSTestCase kXTSTestCases[] = {
"769d1b0e0c0b99ea11de58fcd3b72e1be0ad32884698e15420e52c96b698bba1"
"ce3d9a8750b8",
},

// len = 144 bytes = 9 blocks
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
Expand Down Expand Up @@ -448,17 +461,139 @@ static const XTSTestCase kXTSTestCases[] = {
"e11b6adce343e1f38c6a879463c080d7254c4d65cf40e04934108bcde6bda824"
"4a72a90b1e",
},
// len = 176 bytes = 11 blocks
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
"bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0",
"9a785634120000000000000000000000",
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
"202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"
"404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f"
"808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
"a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
"c30ca8f2ed57307edc87e544867ac888348c208928d7406269954551cb627b5b"
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1ffe2f16cfa1900d7ae2b67f0e6f43b71"
"769d1b0e0c0b99ea11de58fcd3b72e1bce3d9a8750b87e945d77f4dc39d73b04"
"e11b6adce343e1f38c6a879463c080d74a72a90b1e6fe46b7bc95a929f79947e"
"ae8cc61cbb5f8cbd0c6f052e95ed6539",
},
// len = 185 bytes = 11 blocks + 9 bytes
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
"bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0",
"9a785634120000000000000000000000",
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
"202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"
"404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f"
"808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
"a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8",
"c30ca8f2ed57307edc87e544867ac888348c208928d7406269954551cb627b5b"
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1ffe2f16cfa1900d7ae2b67f0e6f43b71"
"769d1b0e0c0b99ea11de58fcd3b72e1bce3d9a8750b87e945d77f4dc39d73b04"
"e11b6adce343e1f38c6a879463c080d74a72a90b1e6fe46b7bc95a929f79947e"
"3ed782ad26e98e07f14d47f3c2a8e92aae8cc61cbb5f8cbd0c",
},
// len = 224 bytes = 14 blocks
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
"bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0",
"9a785634120000000000000000000000",
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
"202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"
"404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f"
"808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
"a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
"c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf",
"c30ca8f2ed57307edc87e544867ac888348c208928d7406269954551cb627b5b"
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1ffe2f16cfa1900d7ae2b67f0e6f43b71"
"769d1b0e0c0b99ea11de58fcd3b72e1bce3d9a8750b87e945d77f4dc39d73b04"
"e11b6adce343e1f38c6a879463c080d74a72a90b1e6fe46b7bc95a929f79947e"
"ae8cc61cbb5f8cbd0c6f052e95ed65399009f56148fc07d88c8e0113d7eafb1f"
"ea39991882130ee45e95a3c6bc508f09c990add0cd3f1ca3403c096f9277e785",
},
// len = 226 bytes = 14 blocks + 2 bytes
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
"bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0",
"9a785634120000000000000000000000",
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
"202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"
"404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f"
"808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
"a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
"c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
"e0e1",
"c30ca8f2ed57307edc87e544867ac888348c208928d7406269954551cb627b5b"
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1ffe2f16cfa1900d7ae2b67f0e6f43b71"
"769d1b0e0c0b99ea11de58fcd3b72e1bce3d9a8750b87e945d77f4dc39d73b04"
"e11b6adce343e1f38c6a879463c080d74a72a90b1e6fe46b7bc95a929f79947e"
"ae8cc61cbb5f8cbd0c6f052e95ed65399009f56148fc07d88c8e0113d7eafb1f"
"ea39991882130ee45e95a3c6bc508f09d2ee8fafae5864a6b21b93bf6a642637"
"c990",
},
// len = 240 bytes = 15 blocks
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
"bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0",
"9a785634120000000000000000000000",
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
"202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"
"404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f"
"808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
"a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
"c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
"e0e1e2e3e4e5e6e7e8e9eaebecedeeef",
"c30ca8f2ed57307edc87e544867ac888348c208928d7406269954551cb627b5b"
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1ffe2f16cfa1900d7ae2b67f0e6f43b71"
"769d1b0e0c0b99ea11de58fcd3b72e1bce3d9a8750b87e945d77f4dc39d73b04"
"e11b6adce343e1f38c6a879463c080d74a72a90b1e6fe46b7bc95a929f79947e"
"ae8cc61cbb5f8cbd0c6f052e95ed65399009f56148fc07d88c8e0113d7eafb1f"
"ea39991882130ee45e95a3c6bc508f09c990add0cd3f1ca3403c096f9277e785"
"6ea0659808172173e234f7dfd6f9789b",
},
// len = 253 bytes = 15 blocks + 13 bytes
{
"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0"
"bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0",
"9a785634120000000000000000000000",
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
"202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"
"404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f"
"808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
"a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
"c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
"e0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfc",
"c30ca8f2ed57307edc87e544867ac888348c208928d7406269954551cb627b5b"
"e1c241d0ff691de6b47ad81eac2b925b474e1fd14311edb95219ce64677f497b"
"8917567652e9b4ef3838baf35e400fe1ffe2f16cfa1900d7ae2b67f0e6f43b71"
"769d1b0e0c0b99ea11de58fcd3b72e1bce3d9a8750b87e945d77f4dc39d73b04"
"e11b6adce343e1f38c6a879463c080d74a72a90b1e6fe46b7bc95a929f79947e"
"ae8cc61cbb5f8cbd0c6f052e95ed65399009f56148fc07d88c8e0113d7eafb1f"
"ea39991882130ee45e95a3c6bc508f09c990add0cd3f1ca3403c096f9277e785"
"4cd6a885857fba751416febc2cc41f2e6ea0659808172173e234f7dfd6",
},
// Test vectors from NIST
// https://csrc.nist.gov/projects/cryptographic-algorithm-validation-program
// 256-bit key, 256-bit data
// 256-bit key, 256-bit data (32 bytes, 2 blocks)
{
"1ea661c58d943a0e4801e42f4b0947149e7f9f8e3e68d0c7505210bd311a0e7c"
"d6e13ffdf2418d8d1911c004cda58da3d619b7e2b9141e58318eea392cf41b08",
"adf8d92627464ad2f0428e84a9f87564",
"2eedea52cd8215e1acc647e810bbc3642e87287f8d2e57e36c0a24fbc12a202e",
"cbaad0e2f6cea3f50b37f934d46a9b130b9d54f07e34f36af793e86f73c6d7db",
},
// 256-bit key, 384-bit data
// 256-bit key, 384-bit data (48 bytes, 3 blocks)
{
"266c336b3b01489f3267f52835fd92f674374b88b4e1ebd2d36a5f457581d9d0"
"42c3eef7b0b7e5137b086496b4d9e6ac658d7196a23f23f036172fdb8faee527",
Expand All @@ -468,7 +603,7 @@ static const XTSTestCase kXTSTestCases[] = {
"c73256870cc2f4dd57acc74b5456dbd776912a128bc1f77d72cdebbf270044b7"
"a43ceed29025e1e8be211fa3c3ed002d",
},
// 256-bit key, 384-bit data
// 256-bit key, 384-bit data (48 bytes, 3 blocks)
{
"33e89e817ff8d037d6ac5a2296657503f20885d94c483e26449066bd9284d130"
"2dbdbb4b66b6b9f4687f13dd028eb6aa528ca91deb9c5f40db93218806033801",
Expand Down
4 changes: 3 additions & 1 deletion generated-src/ios-aarch64/crypto/fipsmodule/aesv8-armx.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,7 +1872,7 @@ Loop5x_dec_after:
.align 4
Lxts_dec_tail4x:
add x0,x0,#16
ld1 {v0.4s},[x0],#16
tst x21,#0xf
eor v5.16b,v1.16b,v4.16b
st1 {v5.16b},[x1],#16
eor v17.16b,v24.16b,v17.16b
Expand All @@ -1881,6 +1881,8 @@ Lxts_dec_tail4x:
eor v31.16b,v26.16b,v31.16b
st1 {v30.16b,v31.16b},[x1],#32

b.eq Lxts_dec_abort
ld1 {v0.4s},[x0],#16
b Lxts_done
.align 4
Lxts_outer_dec_tail:
Expand Down
4 changes: 3 additions & 1 deletion generated-src/linux-aarch64/crypto/fipsmodule/aesv8-armx.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,7 +1872,7 @@ aes_hw_xts_decrypt:
.align 4
.Lxts_dec_tail4x:
add x0,x0,#16
ld1 {v0.4s},[x0],#16
tst x21,#0xf
eor v5.16b,v1.16b,v4.16b
st1 {v5.16b},[x1],#16
eor v17.16b,v24.16b,v17.16b
Expand All @@ -1881,6 +1881,8 @@ aes_hw_xts_decrypt:
eor v31.16b,v26.16b,v31.16b
st1 {v30.16b,v31.16b},[x1],#32

b.eq .Lxts_dec_abort
ld1 {v0.4s},[x0],#16
b .Lxts_done
.align 4
.Lxts_outer_dec_tail:
Expand Down
4 changes: 3 additions & 1 deletion generated-src/win-aarch64/crypto/fipsmodule/aesv8-armx.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@ Loop5x_dec_after:
.align 4
Lxts_dec_tail4x:
add x0,x0,#16
ld1 {v0.4s},[x0],#16
tst x21,#0xf
eor v5.16b,v1.16b,v4.16b
st1 {v5.16b},[x1],#16
eor v17.16b,v24.16b,v17.16b
Expand All @@ -1897,6 +1897,8 @@ Lxts_dec_tail4x:
eor v31.16b,v26.16b,v31.16b
st1 {v30.16b,v31.16b},[x1],#32

b.eq Lxts_dec_abort
ld1 {v0.4s},[x0],#16
b Lxts_done
.align 4
Lxts_outer_dec_tail:
Expand Down
14 changes: 7 additions & 7 deletions tests/ci/cdk/cdk/codebuild/github_ci_linux_arm_omnibus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,10 @@ batch:
variables:
AWS_LC_SSL_RUNNER_START_INDEX: 7001

# - identifier: amazonlinux2023_gcc11x_aarch_valgrind
# buildspec: ./tests/ci/codebuild/common/run_valgrind_tests.yml
# env:
# type: ARM_CONTAINER
# privileged-mode: true
# compute-type: BUILD_GENERAL1_LARGE
# image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2023_gcc-11x_latest
# - identifier: amazonlinux2023_gcc11x_aarch_valgrind
# buildspec: ./tests/ci/codebuild/common/run_valgrind_tests.yml
# env:
# type: ARM_CONTAINER
# privileged-mode: true
# compute-type: BUILD_GENERAL1_LARGE
# image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2023_gcc-11x_latest