arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to rotlConstant and rotrConstant

pull/548/head
Jeffrey Walton 2017-11-24 18:21:27 -05:00
parent 4f2d6f713f
commit 2ac9e61335
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sm3.cpp
View File

@ -2,6 +2,10 @@
// Based on the specification provided by Sean Shen and Xiaodong Lee. // Based on the specification provided by Sean Shen and Xiaodong Lee.
// Based on code by Krzysztof Kwiatkowski and Jack Lloyd. // Based on code by Krzysztof Kwiatkowski and Jack Lloyd.
// Also see https://tools.ietf.org/html/draft-shen-sm3-hash. // Also see https://tools.ietf.org/html/draft-shen-sm3-hash.
//
// We understand future ARMv8 enhancements are supposed
// to include SM3 and SM4 related instructions so the function
// is stubbed for an eventual SM3_HashMultipleBlocks_ARMV8.
#include "pch.h" #include "pch.h"
#include "config.h" #include "config.h"
@ -14,7 +18,7 @@ ANONYMOUS_NAMESPACE_BEGIN
using CryptoPP::byte; using CryptoPP::byte;
using CryptoPP::word32; using CryptoPP::word32;
using CryptoPP::rotlFixed; using CryptoPP::rotlConstant;
using CryptoPP::SM3; using CryptoPP::SM3;
using CryptoPP::GetBlock; using CryptoPP::GetBlock;
@ -22,17 +26,17 @@ using CryptoPP::BigEndian;
inline word32 P0(word32 X) inline word32 P0(word32 X)
{ {
return X ^ rotlFixed(X, 9) ^ rotlFixed(X, 17); return X ^ rotlConstant<9>(X) ^ rotlConstant<17>(X);
} }
inline word32 P1(word32 X) inline word32 P1(word32 X)
{ {
return X ^ rotlFixed(X, 15) ^ rotlFixed(X, 23); return X ^ rotlConstant<15>(X) ^ rotlConstant<23>(X);
} }
inline word32 EE(word32 W0, word32 W7, word32 W13, word32 W3, word32 W10) inline word32 EE(word32 W0, word32 W7, word32 W13, word32 W3, word32 W10)
{ {
return P1(W0 ^ W7 ^ rotlFixed(W13, 15)) ^ rotlFixed(W3, 7) ^ W10; return P1(W0 ^ W7 ^ rotlConstant<15>(W13)) ^ rotlConstant<7>(W3) ^ W10;
} }
inline word32 FF(word32 X, word32 Y, word32 Z) inline word32 FF(word32 X, word32 Y, word32 Z)
@ -48,25 +52,25 @@ inline word32 GG(word32 X, word32 Y, word32 Z)
inline void R1(word32 A, word32& B, word32 C, word32& D, word32 E, word32& F, inline void R1(word32 A, word32& B, word32 C, word32& D, word32 E, word32& F,
word32 G, word32& H, word32 TJ, word32 Wi, word32 Wj) word32 G, word32& H, word32 TJ, word32 Wi, word32 Wj)
{ {
const word32 A12 = rotlFixed(A, 12); const word32 A12 = rotlConstant<12>(A);
const word32 SS1 = rotlFixed(A12 + E + TJ, 7); const word32 TT0 = rotlConstant<7>(A12 + E + TJ);
const word32 TT1 = (A ^ B ^ C) + D + (SS1 ^ A12) + Wj; const word32 TT1 = (A ^ B ^ C) + D + (TT0 ^ A12) + Wj;
const word32 TT2 = (E ^ F ^ G) + H + SS1 + Wi; const word32 TT2 = (E ^ F ^ G) + H + TT0 + Wi;
B = rotlFixed(B, 9); D = TT1; B = rotlConstant<9>(B); D = TT1;
F= rotlFixed(F, 19); H = P0(TT2); F = rotlConstant<19>(F); H = P0(TT2);
} }
inline void R2(word32 A, word32& B, word32 C, word32& D, word32 E, word32& F, inline void R2(word32 A, word32& B, word32 C, word32& D, word32 E, word32& F,
word32 G, word32& H, word32 TJ, word32 Wi, word32 Wj) word32 G, word32& H, word32 TJ, word32 Wi, word32 Wj)
{ {
const word32 A12 = rotlFixed(A, 12); const word32 A12 = rotlConstant<12>(A);
const word32 SS1 = rotlFixed(A12 + E + TJ, 7); const word32 TT0 = rotlConstant<7>(A12 + E + TJ);
const word32 TT1 = FF(A, B, C) + D + (SS1 ^ A12) + Wj; const word32 TT1 = FF(A, B, C) + D + (TT0 ^ A12) + Wj;
const word32 TT2 = GG(E, F, G) + H + SS1 + Wi; const word32 TT2 = GG(E, F, G) + H + TT0 + Wi;
B = rotlFixed(B, 9); D = TT1; B = rotlConstant<9>(B); D = TT1;
F = rotlFixed(F, 19); H = P0(TT2); F = rotlConstant<19>(F); H = P0(TT2);
} }
// Krzysztof Kwiatkowski did a very nice job with this function. // Krzysztof Kwiatkowski did a very nice job with this function.

11
sm4.cpp
View File

@ -1,4 +1,8 @@
// sm4.cpp - written and placed in the public domain by Jeffrey Walton and Han Lulu // sm4.cpp - written and placed in the public domain by Jeffrey Walton and Han Lulu
//
// We understand future ARMv8 enhancements are supposed
// to include SM3 and SM4 related instructions so the function
// is stubbed for an eventual SM4_Round_ARMV8.
#include "pch.h" #include "pch.h"
#include "config.h" #include "config.h"
@ -11,8 +15,7 @@ ANONYMOUS_NAMESPACE_BEGIN
using CryptoPP::byte; using CryptoPP::byte;
using CryptoPP::word32; using CryptoPP::word32;
using CryptoPP::rotlFixed; using CryptoPP::rotlConstant;
using CryptoPP::rotrFixed;
const byte S[256] = const byte S[256] =
{ {
@ -54,13 +57,13 @@ inline word32 SM4_H(word32 x)
inline word32 SM4_G(word32 x) inline word32 SM4_G(word32 x)
{ {
const word32 t = SM4_H(x); const word32 t = SM4_H(x);
return t ^ rotlFixed(t, 13) ^ rotlFixed(t, 23); return t ^ rotlConstant<13>(t) ^ rotlConstant<23>(t);
} }
inline word32 SM4_F(word32 x) inline word32 SM4_F(word32 x)
{ {
const word32 t = SM4_H(x); const word32 t = SM4_H(x);
return t ^ rotlFixed(t, 2) ^ rotlFixed(t, 10) ^ rotlFixed(t, 18) ^ rotlFixed(t, 24); return t ^ rotlConstant<2>(t) ^ rotlConstant<10>(t) ^ rotlConstant<18>(t) ^ rotlConstant<24>(t);
} }
template <unsigned int R, bool FWD> template <unsigned int R, bool FWD>