arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleared fall through warnings under GCC 7 (Issue 441)

pull/397/merge
Jeffrey Walton 2017-07-17 04:48:28 -04:00
parent fe63795638
commit 50d1ea8314
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
TestScripts/reset-fork.sh Normal file → Executable file
View File

10
asn.cpp
View File

@ -330,7 +330,8 @@ void EncodedObjectFilter::Put(const byte *inString, size_t length)
if (!m_queue.Get(m_id)) if (!m_queue.Get(m_id))
return; return;
m_queue.TransferTo(CurrentTarget(), 1); m_queue.TransferTo(CurrentTarget(), 1);
m_state = LENGTH; // fall through m_state = LENGTH;
// fall through
case LENGTH: case LENGTH:
{ {
byte b; byte b;
@ -356,15 +357,16 @@ void EncodedObjectFilter::Put(const byte *inString, size_t length)
m_state = IDENTIFIER; m_state = IDENTIFIER;
break; break;
} }
m_state = BODY; // fall through m_state = BODY;
} }
// fall through
case BODY: case BODY:
m_lengthRemaining -= m_queue.TransferTo(CurrentTarget(), m_lengthRemaining); m_lengthRemaining -= m_queue.TransferTo(CurrentTarget(), m_lengthRemaining);
if (m_lengthRemaining == 0) if (m_lengthRemaining == 0)
m_state = IDENTIFIER; m_state = IDENTIFIER;
// fall through
case TAIL: // silence warnings case TAIL:
case ALL_DONE: case ALL_DONE:
default: ;; default: ;;
} }

2
fltrimpl.h
View File

@ -54,6 +54,7 @@
#define FILTER_OUTPUT2_MODIFIABLE(site, statement, output, length, messageEnd) \ #define FILTER_OUTPUT2_MODIFIABLE(site, statement, output, length, messageEnd) \
{\ {\
/* fall through */ \
case site: \ case site: \
statement; \ statement; \
if (OutputModifiable(site, output, length, messageEnd, blocking)) \ if (OutputModifiable(site, output, length, messageEnd, blocking)) \
@ -65,6 +66,7 @@
#define FILTER_OUTPUT2_MAYBE_MODIFIABLE(site, statement, output, length, messageEnd, modifiable) \ #define FILTER_OUTPUT2_MAYBE_MODIFIABLE(site, statement, output, length, messageEnd, modifiable) \
{\ {\
/* fall through */ \
case site: \ case site: \
statement; \ statement; \
if (modifiable ? OutputModifiable(site, output, length, messageEnd, blocking) : Output(site, output, length, messageEnd, blocking)) \ if (modifiable ? OutputModifiable(site, output, length, messageEnd, blocking) : Output(site, output, length, messageEnd, blocking)) \

8
siphash.h
View File

@ -214,21 +214,27 @@ void SipHash_Base<C,D,T_128bit>::TruncatedFinal(byte *digest, size_t digestSize)
m_b[0] += m_idx; m_b[0] <<= 56U; m_b[0] += m_idx; m_b[0] <<= 56U;
switch (m_idx) switch (m_idx)
{ {
// all fall through
case 7: case 7:
m_b[0] |= ((word64)m_acc[6]) << 48; m_b[0] |= ((word64)m_acc[6]) << 48;
// fall through
case 6: case 6:
m_b[0] |= ((word64)m_acc[5]) << 40; m_b[0] |= ((word64)m_acc[5]) << 40;
// fall through
case 5: case 5:
m_b[0] |= ((word64)m_acc[4]) << 32; m_b[0] |= ((word64)m_acc[4]) << 32;
// fall through
case 4: case 4:
m_b[0] |= ((word64)m_acc[3]) << 24; m_b[0] |= ((word64)m_acc[3]) << 24;
// fall through
case 3: case 3:
m_b[0] |= ((word64)m_acc[2]) << 16; m_b[0] |= ((word64)m_acc[2]) << 16;
// fall through
case 2: case 2:
m_b[0] |= ((word64)m_acc[1]) << 8; m_b[0] |= ((word64)m_acc[1]) << 8;
// fall through
case 1: case 1:
m_b[0] |= ((word64)m_acc[0]); m_b[0] |= ((word64)m_acc[0]);
// fall through
case 0: case 0:
break; break;
} }

2
twofish.cpp
View File

@ -37,7 +37,9 @@ inline word32 Twofish::Base::h0(word32 x, const word32 *key, unsigned int kLen)
{ {
#define Q(a, b, c, d, t) q[a][GETBYTE(t,0)] ^ (q[b][GETBYTE(t,1)] << 8) ^ (q[c][GETBYTE(t,2)] << 16) ^ (q[d][GETBYTE(t,3)] << 24) #define Q(a, b, c, d, t) q[a][GETBYTE(t,0)] ^ (q[b][GETBYTE(t,1)] << 8) ^ (q[c][GETBYTE(t,2)] << 16) ^ (q[d][GETBYTE(t,3)] << 24)
case 4: x = Q(1, 0, 0, 1, x) ^ key[6]; case 4: x = Q(1, 0, 0, 1, x) ^ key[6];
// fall through
case 3: x = Q(1, 1, 0, 0, x) ^ key[4]; case 3: x = Q(1, 1, 0, 0, x) ^ key[4];
// fall through
case 2: x = Q(0, 1, 0, 1, x) ^ key[2]; case 2: x = Q(0, 1, 0, 1, x) ^ key[2];
x = Q(0, 0, 1, 1, x) ^ key[0]; x = Q(0, 0, 1, 1, x) ^ key[0];
} }