aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/safer
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/safer
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/safer')
-rw-r--r--src/block/safer/safer_sk.cpp2
-rw-r--r--src/block/safer/safer_sk.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/safer/safer_sk.cpp b/src/block/safer/safer_sk.cpp
index 639130714..00e57e2a4 100644
--- a/src/block/safer/safer_sk.cpp
+++ b/src/block/safer/safer_sk.cpp
@@ -66,7 +66,7 @@ void SAFER_SK::dec(const byte in[], byte out[]) const
/*************************************************
* SAFER-SK Key Schedule *
*************************************************/
-void SAFER_SK::key(const byte key[], u32bit)
+void SAFER_SK::key_schedule(const byte key[], u32bit)
{
SecureBuffer<byte, 18> KB;
diff --git a/src/block/safer/safer_sk.h b/src/block/safer/safer_sk.h
index 121cf545b..0db32e20f 100644
--- a/src/block/safer/safer_sk.h
+++ b/src/block/safer/safer_sk.h
@@ -23,7 +23,7 @@ class BOTAN_DLL SAFER_SK : public BlockCipher
private:
void enc(const byte[], byte[]) const;
void dec(const byte[], byte[]) const;
- void key(const byte[], u32bit);
+ void key_schedule(const byte[], u32bit);
static const byte EXP[256];
static const byte LOG[512];