From a02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Sun, 9 Nov 2008 15:57:31 +0000
Subject: Rename SymmetricAlgorithm::key to key_schedule to avoid many name
 conflicts/collisions

---
 src/block/mars/mars.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/block/mars/mars.cpp')

diff --git a/src/block/mars/mars.cpp b/src/block/mars/mars.cpp
index cc671fc06..5f93f2df4 100644
--- a/src/block/mars/mars.cpp
+++ b/src/block/mars/mars.cpp
@@ -213,7 +213,7 @@ void MARS::decrypt_round(u32bit& A, u32bit& B, u32bit& C, u32bit& D,
 /*************************************************
 * MARS Key Schedule                              *
 *************************************************/
-void MARS::key(const byte key[], u32bit length)
+void MARS::key_schedule(const byte key[], u32bit length)
    {
    SecureBuffer<u32bit, 15> T;
    for(u32bit j = 0; j != length / 4; ++j)
-- 
cgit v1.2.3