diff options
author | lloyd <[email protected]> | 2010-03-03 00:47:19 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-03-03 00:47:19 +0000 |
commit | 265c39bd4efb3155ec68ea09018a3e83499862f9 (patch) | |
tree | f94564a2d332febdbd546ded6127d0b1e1246059 /src/stream/salsa20/salsa20.h | |
parent | e04cd85725b712c747ef5dbed2e94b7a7207ef22 (diff) |
Add XSalsa20
Diffstat (limited to 'src/stream/salsa20/salsa20.h')
-rw-r--r-- | src/stream/salsa20/salsa20.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/stream/salsa20/salsa20.h b/src/stream/salsa20/salsa20.h index 3ca781ea2..016745355 100644 --- a/src/stream/salsa20/salsa20.h +++ b/src/stream/salsa20/salsa20.h @@ -1,6 +1,6 @@ /* -* Salsa20 -* (C) 1999-2008 Jack Lloyd +* Salsa20 / XSalsa20 +* (C) 1999-2010 Jack Lloyd * * Distributed under the terms of the Botan license */ @@ -13,7 +13,7 @@ namespace Botan { /* -* Salsa20 +* Salsa20 (and XSalsa20) */ class BOTAN_DLL Salsa20 : public StreamCipher { @@ -23,7 +23,7 @@ class BOTAN_DLL Salsa20 : public StreamCipher void set_iv(const byte iv[], u32bit iv_len); bool valid_iv_length(u32bit iv_len) const - { return (iv_len == 8); } + { return (iv_len == 8 || iv_len == 24); } void clear(); std::string name() const; |