File gostcrypt-1.3-fix-inline-warnings.patch of Package GostCrypt

File gostcrypt-1.3-fix-inline-warnings.patch of Package GostCrypt (Revision 7)

Currently displaying revision 7 , Show latest

From: Antoine Belvire <antoine.belvire@laposte.net>
Date: Sat, 23 Jan 2016 11:44:20 +0100
Subject: Fix warnings about inline functions
Upstream: not submitted

=====================================================
diff --git a/Crypto/GrasshopperCipher.c b/Crypto/GrasshopperCipher.c
--- a/Crypto/GrasshopperCipher.c  2015-07-24 10:03:04.000000000 +0200
+++ b/Crypto/GrasshopperCipher.c  2016-01-23 12:13:20.592557196 +0100
@@ -121,7 +121,9 @@ unsigned char mult_mod_poly[8][256] = {
 			8, 243,  61, 198,  98, 153,  87, 172, 220,  39, 233,  18, 182,  77, 131, 120,  99, 152,  86, 173,   9, 242,  60, 199, 183,  76, 130, 121, 221,  38, 232,  19,
 			177,  74, 132, 127, 219,  32, 238,  21, 101, 158,  80, 171,  15, 244,  58, 193, 218,  33, 239,  20, 176,  75, 133, 126,  14, 245,  59, 192, 100, 159,  81, 170,
 			103, 156,  82, 169,  13, 246,  56, 195, 179,  72, 134, 125, 217,  34, 236,  23,  12, 247,  57, 194, 102, 157,  83, 168, 216,  35, 237,  22, 178,  73, 135, 124}};
-void S(unsigned long long * block)
+
+/* S conversion function                            */
+inline void S(unsigned long long * block)
 {
     unsigned long long valtmp;
 
@@ -149,7 +151,7 @@ void S(unsigned long long * block)
 }
 
 /* Inverse of S conversion function                */
-void S_inv(unsigned long long * block)
+inline void S_inv(unsigned long long * block)
 {
     unsigned long long valtmp;
 
@@ -176,6 +178,7 @@ void S_inv(unsigned long long * block)
     block[1] = valtmp;
 }
 
+/* Linear transformation                           */
 inline unsigned char ll(unsigned long long *block)
 {
 	
diff --git a/Crypto/GrasshopperCipher.h b/Crypto/GrasshopperCipher.h
--- a/Crypto/GrasshopperCipher.h  2015-07-24 10:03:04.000000000 +0200
+++ b/Crypto/GrasshopperCipher.h  2016-01-23 12:13:20.592557196 +0100
@@ -66,28 +66,28 @@ typedef struct grasshopper_kds
 /****************************************************/
 
 /* S conversion function                            */
-inline void S(unsigned long long * block);
+//inline void S(unsigned long long * block);
 
 /* Inverse of S conversion function                */
-inline void S_inv(unsigned long long * block);
-/* Linear transformation                           */
+//inline void S_inv(unsigned long long * block);
 
-inline unsigned char ll(unsigned long long block[2]);
+/* Linear transformation                           */
+//inline unsigned char ll(unsigned long long block[2]);
 
 /* R conversion function                            */
- inline void R(unsigned long long * block);
+//inline void R(unsigned long long * block);
 
 /* Inverse of R conversion function                 */
-inline void R_inv(unsigned long long * block);
+//inline void R_inv(unsigned long long * block);
 
 /* L conversion function (16 iteration of R)        */
-inline void L(unsigned long long * block);
+//inline void L(unsigned long long * block);
 
 /* Inverse of L conversion function (16 iteration of R_inv) */
-inline void L_inv(unsigned long long * block);
+//inline void L_inv(unsigned long long * block);
 
 /* F conversion function (used in key setup)        */
- inline void F(unsigned long long * k, unsigned long long * block1, unsigned long long * block0);
+//inline void F(unsigned long long * k, unsigned long long * block1, unsigned long long * block0);
 
 /****************************************************/
 /****************************************************/