diff options
author | Doug Ledford <dledford@redhat.com> | 2017-09-25 11:15:38 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-09-25 11:16:58 -0400 |
commit | e83c465ae14844b2dfff55178b82eeaccbef0b24 (patch) | |
tree | 9ba289bdd8831b061743a8d48b13e6128306b8f1 /crypto/testmgr.h | |
parent | f960b5ebd9ed09bc12e10c712bce82ab58ef0435 (diff) | |
parent | 508f8d23a372beae647185ce896a0c1109406b83 (diff) | |
download | linux-crypto-e83c465ae14844b2dfff55178b82eeaccbef0b24.tar.gz linux-crypto-e83c465ae14844b2dfff55178b82eeaccbef0b24.zip |
Merge tag 'v4.14-rc2' into k.o/for-next
Merge my for-next branch to Linux 4.14-rc2 and open up the for-next area
for 4.15 kernel development.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'crypto/testmgr.h')
-rw-r--r-- | crypto/testmgr.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/testmgr.h b/crypto/testmgr.h index 6ceb0e27..d54971d2 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -32675,6 +32675,10 @@ static const struct cipher_testvec chacha20_enc_tv_template[] = { "\x5b\x86\x2f\x37\x30\xe3\x7c\xfd" "\xc4\xfd\x80\x6c\x22\xf2\x21", .rlen = 375, + .also_non_np = 1, + .np = 3, + .tap = { 375 - 20, 4, 16 }, + }, { /* RFC7539 A.2. Test Vector #3 */ .key = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a" "\xf3\x33\x88\x86\x04\xf6\xb5\xf0" @@ -33049,6 +33053,9 @@ static const struct cipher_testvec chacha20_enc_tv_template[] = { "\xa1\xed\xad\xd5\x76\xfa\x24\x8f" "\x98", .rlen = 1281, + .also_non_np = 1, + .np = 3, + .tap = { 1200, 1, 80 }, }, }; |