From 238b5e6188e1c6ddcd1de17348daff4f68900aba Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 8 May 2017 03:20:23 -0400 Subject: [PATCH] Whitespace check-in --- kalyna.cpp | 10 +++------- kalyna.h | 2 +- kalynatab.cpp | 6 ------ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/kalyna.cpp b/kalyna.cpp index 1bc833cf..e8be7238 100644 --- a/kalyna.cpp +++ b/kalyna.cpp @@ -6,7 +6,7 @@ // (http://github.com/Roman-Oliynykov/Kalyna-reference). The third and most utilized resource // was Keru Kuro's public domain implementation of Kalyna in CppCrypto // (http://sourceforge.net/projects/cppcrypto/). Kuro has an outstanding implementation that -// performed better than the reference implementation and out intial attempts. The only downside +// performed better than the reference implementation and our initial attempts. The only downside // was the missing big endian port. #include "pch.h" @@ -927,11 +927,6 @@ void Kalyna::Base::SetKey_88(const word64 key[8]) } } -//template -//void Kalyna::Base::SetKey_Template(const word64 key[NK]) -//{ -//} - // *********************** ProcessAndXorBlock specializations *********************** // void Kalyna::Base::ProcessBlock_22(const word64 inBlock[2], word64 outBlock[2]) const @@ -1103,7 +1098,8 @@ void Kalyna::Base::ProcessBlock_44(const word64 inBlock[4], word64 outBlock[4]) #if defined(IS_BIG_ENDIAN) { typedef GetBlock Block; - Block block(t1); block(outBlock[0])(outBlock[1])(outBlock[2])(outBlock[3]); + Block block(t1); + block(outBlock[0])(outBlock[1])(outBlock[2])(outBlock[3]); } #endif } diff --git a/kalyna.h b/kalyna.h index 0e77a1fb..1440a4bb 100644 --- a/kalyna.h +++ b/kalyna.h @@ -9,7 +9,7 @@ //! Oliynykov and Oleksandr Kazymyrov's GitHub with the reference implementation //! (http://github.com/Roman-Oliynykov/Kalyna-reference). The third resource was Keru Kuro's implementation //! of Kalyna in CppCrypto (http://sourceforge.net/projects/cppcrypto/). Kuro has an outstanding -//! implementation that performed better than the reference implementation and out intial attempts. +//! implementation that performed better than the reference implementation and our initial attempts. #ifndef CRYPTOPP_KALYNA_H #define CRYPTOPP_KALYNA_H diff --git a/kalynatab.cpp b/kalynatab.cpp index 49f495f1..1c9c225b 100644 --- a/kalynatab.cpp +++ b/kalynatab.cpp @@ -9,8 +9,6 @@ NAMESPACE_BEGIN(KalynaTab) #define EXPORT_TABLE extern -#if defined(IS_LITTLE_ENDIAN) - EXPORT_TABLE const word64 T[8][256] = { @@ -1077,10 +1075,6 @@ const word64 IT[8][256] = } }; -#else -# error "Only little endian is supported at the moment" -#endif - EXPORT_TABLE const byte S[4][256] = {