aboutsummaryrefslogtreecommitdiffstats
path: root/src/stream/turing
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-11-09 15:57:31 +0000
committerlloyd <[email protected]>2008-11-09 15:57:31 +0000
commita02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 (patch)
tree57899ab98328aea62d6d665a38638e112697ff5a /src/stream/turing
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/stream/turing')
-rw-r--r--src/stream/turing/turing.cpp2
-rw-r--r--src/stream/turing/turing.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/stream/turing/turing.cpp b/src/stream/turing/turing.cpp
index df0d3f5e8..bdf320364 100644
--- a/src/stream/turing/turing.cpp
+++ b/src/stream/turing/turing.cpp
@@ -237,7 +237,7 @@ void Turing::gen_sbox(MemoryRegion<u32bit>& S, u32bit which,
/*************************************************
* Turing Key Schedule *
*************************************************/
-void Turing::key(const byte key[], u32bit length)
+void Turing::key_schedule(const byte key[], u32bit length)
{
K.create(length / 4);
for(u32bit j = 0; j != length; ++j)
diff --git a/src/stream/turing/turing.h b/src/stream/turing/turing.h
index f50fd9370..018196fd3 100644
--- a/src/stream/turing/turing.h
+++ b/src/stream/turing/turing.h
@@ -22,7 +22,7 @@ class BOTAN_DLL Turing : public StreamCipher
Turing() : StreamCipher(4, 32, 4) { position = 0; }
private:
void cipher(const byte[], byte[], u32bit);
- void key(const byte[], u32bit);
+ void key_schedule(const byte[], u32bit);
void resync(const byte[], u32bit);
void generate();