Keccak: fromBytesToWord() and fromWordToBytes() are required on 64bit big endian platforms

tiran · tiran · commit ba3e4a0bc07b · 2012-10-14T00:59:29.000+02:00
diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt64.c b/Modules/_sha3/keccak/KeccakF-1600-opt64.c
@@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned char *state)
     KeccakPermutationOnWords((UINT64*)state);
 }
 
-/*
+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)
 static void fromBytesToWord(UINT64 *word, const UINT8 *bytes)
 {
     unsigned int i;
@@ -333,7 +333,8 @@ static void fromBytesToWord(UINT64 *word, const UINT8 *bytes)
     for(i=0; i<(64/8); i++)
         *word |= (UINT64)(bytes[i]) << (8*i);
 }
-*/
+#endif
+
 
 #ifdef ProvideFast576
 static void KeccakAbsorb576bits(unsigned char *state, const unsigned char *data)
@@ -445,15 +446,16 @@ static void KeccakAbsorb(unsigned char *state, const unsigned char *data, unsign
 #endif
 }
 
-/*
+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)
 static void fromWordToBytes(UINT8 *bytes, const UINT64 word)
 {
     unsigned int i;
 
     for(i=0; i<(64/8); i++)
         bytes[i] = (word >> (8*i)) & 0xFF;
 }
-*/
+#endif
+
 
 #ifdef ProvideFast1024
 static void KeccakExtract1024bits(const unsigned char *state, unsigned char *data)

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned char *state)`
`324`	`324`	`KeccakPermutationOnWords((UINT64*)state);`
`325`	`325`	`}`
`326`	`326`
`327`		`-/*`
	`327`	`+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)`
`328`	`328`	`static void fromBytesToWord(UINT64 word, const UINT8 bytes)`
`329`	`329`	`{`
`330`	`330`	`unsigned int i;`
`@@ -333,7 +333,8 @@ static void fromBytesToWord(UINT64 word, const UINT8 bytes)`
`333`	`333`	`for(i=0; i<(64/8); i++)`
`334`	`334`	`word \|= (UINT64)(bytes[i]) << (8i);`
`335`	`335`	`}`
`336`		`-*/`
	`336`	`+#endif`
	`337`	`+`
`337`	`338`
`338`	`339`	`#ifdef ProvideFast576`
`339`	`340`	`static void KeccakAbsorb576bits(unsigned char state, const unsigned char data)`
`@@ -445,15 +446,16 @@ static void KeccakAbsorb(unsigned char state, const unsigned char data, unsign`
`445`	`446`	`#endif`
`446`	`447`	`}`
`447`	`448`
`448`		`-/*`
	`449`	`+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)`
`449`	`450`	`static void fromWordToBytes(UINT8 *bytes, const UINT64 word)`
`450`	`451`	`{`
`451`	`452`	`unsigned int i;`
`452`	`453`
`453`	`454`	`for(i=0; i<(64/8); i++)`
`454`	`455`	`bytes[i] = (word >> (8*i)) & 0xFF;`
`455`	`456`	`}`
`456`		`-*/`
	`457`	`+#endif`
	`458`	`+`
`457`	`459`
`458`	`460`	`#ifdef ProvideFast1024`
`459`	`461`	`static void KeccakExtract1024bits(const unsigned char state, unsigned char data)`