From 1ff6f39ec654cd5690a43a3a2e15d668afe5dd2b Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 28 Oct 2018 06:09:46 -0400
Subject: [PATCH] Add proper declaration for Kalyna tables; and split from
 definitions

---
 kalynatab.cpp | 9 +++++----
 sha.cpp       | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kalynatab.cpp b/kalynatab.cpp
index 646643a0..d4ad171c 100644
--- a/kalynatab.cpp
+++ b/kalynatab.cpp
@@ -7,7 +7,11 @@
 NAMESPACE_BEGIN(CryptoPP)
 NAMESPACE_BEGIN(KalynaTab)
 
-CRYPTOPP_TABLE
+extern const word64 T[8][256];  // Columns
+extern const word64 IT[8][256]; // Inverse
+extern const byte S[4][256];    // Substitution
+extern const byte IS[4][256];   // Inverse
+
 const word64 T[8][256] =
 {
     {
@@ -540,7 +544,6 @@ const word64 T[8][256] =
     }
 };
 
-CRYPTOPP_TABLE
 const word64 IT[8][256] =
 {
     {
@@ -1073,7 +1076,6 @@ const word64 IT[8][256] =
     }
 };
 
-CRYPTOPP_TABLE
 const byte S[4][256] =
 {
     {
@@ -1150,7 +1152,6 @@ const byte S[4][256] =
     }
 };
 
-CRYPTOPP_TABLE
 const byte IS[4][256] =
 {
     {
diff --git a/sha.cpp b/sha.cpp
index 40a441d9..78f0ab5b 100644
--- a/sha.cpp
+++ b/sha.cpp
@@ -73,11 +73,11 @@ extern void SHA256_HashMultipleBlocks_POWER8(word32 *state, const word32 *data,
 extern void SHA512_HashMultipleBlocks_POWER8(word64 *state, const word64 *data, size_t length, ByteOrder order);
 #endif
 
+// We add extern to export table to sha-simd.cpp, but it
+//  cleared http://github.com/weidai11/cryptopp/issues/502
 extern const word32 SHA256_K[64];
 extern const word64 SHA512_K[80];
 
-// We add extern to export table to sha-simd.cpp, but it
-//  cleared http://github.com/weidai11/cryptopp/issues/502
 CRYPTOPP_ALIGN_DATA(16)
 const word64 SHA512_K[80] = {
     W64LIT(0x428a2f98d728ae22), W64LIT(0x7137449123ef65cd),