aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/serpent_ia32/serp_ia32.cpp
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/block/serpent_ia32/serp_ia32.cpp
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/serpent_ia32/serp_ia32.cpp')
-rw-r--r--src/block/serpent_ia32/serp_ia32.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/block/serpent_ia32/serp_ia32.cpp b/src/block/serpent_ia32/serp_ia32.cpp
index 2cd607c18..ec7574799 100644
--- a/src/block/serpent_ia32/serp_ia32.cpp
+++ b/src/block/serpent_ia32/serp_ia32.cpp
@@ -35,7 +35,7 @@ void Serpent_IA32::dec(const byte in[], byte out[]) const
/*************************************************
* Serpent Key Schedule *
*************************************************/
-void Serpent_IA32::key(const byte key[], u32bit length)
+void Serpent_IA32::key_schedule(const byte key[], u32bit length)
{
SecureBuffer<u32bit, 140> W;
for(u32bit j = 0; j != length / 4; ++j)