From 2ac9e613358cd00a10ce0916a4488473292b76b1 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 24 Nov 2017 18:21:27 -0500
Subject: Switch to rotlConstant and rotrConstant

---
 sm4.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'sm4.cpp')

diff --git a/sm4.cpp b/sm4.cpp
index 1a157c1d..1aa2a1ff 100644
--- a/sm4.cpp
+++ b/sm4.cpp
@@ -1,4 +1,8 @@
 // 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 "config.h"
@@ -11,8 +15,7 @@ ANONYMOUS_NAMESPACE_BEGIN
 
 using CryptoPP::byte;
 using CryptoPP::word32;
-using CryptoPP::rotlFixed;
-using CryptoPP::rotrFixed;
+using CryptoPP::rotlConstant;
 
 const byte S[256] =
 {
@@ -54,13 +57,13 @@ inline word32 SM4_H(word32 x)
 inline word32 SM4_G(word32 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)
 {
     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>
-- 
cgit v1.2.1