summaryrefslogtreecommitdiff
path: root/salsa.h
diff options
context:
space:
mode:
Diffstat (limited to 'salsa.h')
-rwxr-xr-xsalsa.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/salsa.h b/salsa.h
index 8d6bedf..176a1a3 100755
--- a/salsa.h
+++ b/salsa.h
@@ -8,7 +8,7 @@
NAMESPACE_BEGIN(CryptoPP)
//! _
-struct Salsa20_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInterface::STRUCTURED_IV, 8>
+struct Salsa20_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInterface::UNIQUE_IV, 8>
{
static const char *StaticAlgorithmName() {return "Salsa20";}
};
@@ -22,13 +22,17 @@ protected:
void CipherResynchronize(byte *keystreamBuffer, const byte *IV);
bool IsRandomAccess() const {return true;}
void SeekToIteration(lword iterationCount);
+#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64
+ unsigned int GetAlignment() const;
+ unsigned int GetOptimalBlockSize() const;
+#endif
private:
+ FixedSizeAlignedSecBlock<word32, 16> m_state;
int m_rounds;
- FixedSizeSecBlock<word32, 16> m_state;
};
-//! Salsa20, variable rounds: 8, 12 or 20 (default 20)
+/// <a href="http://www.cryptolounge.org/wiki/Salsa20">Salsa20</a>, variable rounds: 8, 12 or 20 (default 20)
struct Salsa20 : public Salsa20_Info, public SymmetricCipherDocumentation
{
typedef SymmetricCipherFinal<ConcretePolicyHolder<Salsa20_Policy, AdditiveCipherTemplate<> >, Salsa20_Info> Encryption;