From a02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 Mon Sep 17 00:00:00 2001 From: lloyd Date: Sun, 9 Nov 2008 15:57:31 +0000 Subject: Rename SymmetricAlgorithm::key to key_schedule to avoid many name conflicts/collisions --- src/block/misty1/misty1.cpp | 2 +- src/block/misty1/misty1.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/block/misty1') diff --git a/src/block/misty1/misty1.cpp b/src/block/misty1/misty1.cpp index 523d11c84..234cf8e72 100644 --- a/src/block/misty1/misty1.cpp +++ b/src/block/misty1/misty1.cpp @@ -116,7 +116,7 @@ void MISTY1::dec(const byte in[], byte out[]) const /************************************************* * MISTY1 Key Schedule * *************************************************/ -void MISTY1::key(const byte key[], u32bit length) +void MISTY1::key_schedule(const byte key[], u32bit length) { SecureBuffer KS; for(u32bit j = 0; j != length / 2; ++j) diff --git a/src/block/misty1/misty1.h b/src/block/misty1/misty1.h index 0bd3ca1e4..2092b7e91 100644 --- a/src/block/misty1/misty1.h +++ b/src/block/misty1/misty1.h @@ -23,7 +23,7 @@ class BOTAN_DLL MISTY1 : 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 EK_ORDER[100]; static const byte DK_ORDER[100]; -- cgit v1.2.3