diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-08-22 14:53:32 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-08-22 14:53:32 +0800 |
commit | 4be777cec4a84f99aac7f655d638c4c1bc0ade0e (patch) | |
tree | 065076d19888c1606a664edf3994a951da4c501b /crypto/testmgr.h | |
parent | c1b1fa586429a5445ce480ddc75ed76568caef8f (diff) | |
parent | 4f673910a79f5cb0e7dd87bf807eebb24834cea3 (diff) | |
download | linux-crypto-4be777cec4a84f99aac7f655d638c4c1bc0ade0e.tar.gz linux-crypto-4be777cec4a84f99aac7f655d638c4c1bc0ade0e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.
Diffstat (limited to '')
-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 }, }, }; |