Skip to content

C
cpython
Kaydet (Commit) fa15c854 authored tarafından Christian Heimes's avatar Christian Heimes
Dosyalara gözat
Seçenekler

Issue #16113: take 2 on big endian machines.

üst 393b82e4
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
Modules/_sha3/kcp/KeccakP-1600-inplace32BI.c
Dosyayı görüntüle @ fa15c854
...@@ -188,17 +188,18 @@ void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int l ...@@ -188,17 +188,18 @@ void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int l
unsigned int lanePosition; unsigned int lanePosition;
for(lanePosition=0; lanePosition<laneCount; lanePosition++) { for(lanePosition=0; lanePosition<laneCount; lanePosition++) {
UINT8 laneAsBytes[8]; UINT8 laneAsBytes[8];
UINT32 low, high, temp, temp0, temp1;
UINT32 *stateAsHalfLanes;
memcpy(laneAsBytes, data+lanePosition*8, 8); memcpy(laneAsBytes, data+lanePosition*8, 8);
UINT32 low = laneAsBytes[0] low = laneAsBytes[0]
| ((UINT32)(laneAsBytes[1]) << 8) | ((UINT32)(laneAsBytes[1]) << 8)
| ((UINT32)(laneAsBytes[2]) << 16) | ((UINT32)(laneAsBytes[2]) << 16)
| ((UINT32)(laneAsBytes[3]) << 24); | ((UINT32)(laneAsBytes[3]) << 24);
UINT32 high = laneAsBytes[4] high = laneAsBytes[4]
| ((UINT32)(laneAsBytes[5]) << 8) | ((UINT32)(laneAsBytes[5]) << 8)
| ((UINT32)(laneAsBytes[6]) << 16) | ((UINT32)(laneAsBytes[6]) << 16)
| ((UINT32)(laneAsBytes[7]) << 24); | ((UINT32)(laneAsBytes[7]) << 24);
UINT32 even, odd, temp, temp0, temp1; stateAsHalfLanes = (UINT32*)state;
UINT32 *stateAsHalfLanes = (UINT32*)state;
toBitInterleavingAndXOR(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1); toBitInterleavingAndXOR(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1);
} }
#endif #endif
...@@ -243,17 +244,18 @@ void KeccakP1600_OverwriteLanes(void *state, const unsigned char *data, unsigned ...@@ -243,17 +244,18 @@ void KeccakP1600_OverwriteLanes(void *state, const unsigned char *data, unsigned
unsigned int lanePosition; unsigned int lanePosition;
for(lanePosition=0; lanePosition<laneCount; lanePosition++) { for(lanePosition=0; lanePosition<laneCount; lanePosition++) {
UINT8 laneAsBytes[8]; UINT8 laneAsBytes[8];
UINT32 low, high, temp, temp0, temp1;
UINT32 *stateAsHalfLanes;
memcpy(laneAsBytes, data+lanePosition*8, 8); memcpy(laneAsBytes, data+lanePosition*8, 8);
UINT32 low = laneAsBytes[0] low = laneAsBytes[0]
| ((UINT32)(laneAsBytes[1]) << 8) | ((UINT32)(laneAsBytes[1]) << 8)
| ((UINT32)(laneAsBytes[2]) << 16) | ((UINT32)(laneAsBytes[2]) << 16)
| ((UINT32)(laneAsBytes[3]) << 24); | ((UINT32)(laneAsBytes[3]) << 24);
UINT32 high = laneAsBytes[4] high = laneAsBytes[4]
| ((UINT32)(laneAsBytes[5]) << 8) | ((UINT32)(laneAsBytes[5]) << 8)
| ((UINT32)(laneAsBytes[6]) << 16) | ((UINT32)(laneAsBytes[6]) << 16)
| ((UINT32)(laneAsBytes[7]) << 24); | ((UINT32)(laneAsBytes[7]) << 24);
UINT32 even, odd, temp, temp0, temp1; stateAsHalfLanes = (UINT32*)state;
UINT32 *stateAsHalfLanes = (UINT32*)state;
toBitInterleavingAndSet(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1); toBitInterleavingAndSet(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1);
} }
#endif #endif
...@@ -406,8 +408,8 @@ void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *inpu ...@@ -406,8 +408,8 @@ void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *inpu
for(lanePosition=0; lanePosition<laneCount; lanePosition++) { for(lanePosition=0; lanePosition<laneCount; lanePosition++) {
UINT32 *stateAsHalfLanes = (UINT32*)state; UINT32 *stateAsHalfLanes = (UINT32*)state;
UINT32 low, high, temp, temp0, temp1; UINT32 low, high, temp, temp0, temp1;
fromBitInterleaving(stateAsHalfLanes[lanePosition*2], stateAsHalfLanes[lanePosition*2+1], low, high, temp, temp0, temp1);
UINT8 laneAsBytes[8]; UINT8 laneAsBytes[8];
fromBitInterleaving(stateAsHalfLanes[lanePosition*2], stateAsHalfLanes[lanePosition*2+1], low, high, temp, temp0, temp1);
laneAsBytes[0] = low & 0xFF; laneAsBytes[0] = low & 0xFF;
laneAsBytes[1] = (low >> 8) & 0xFF; laneAsBytes[1] = (low >> 8) & 0xFF;
laneAsBytes[2] = (low >> 16) & 0xFF; laneAsBytes[2] = (low >> 16) & 0xFF;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment