diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-05-11 16:21:37 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-05-11 19:39:38 +0200 |
| commit | 018fcbec38509cd03fb0709904a382c3bfcf5ed4 (patch) | |
| tree | cb03c315ac98d80e53a0662f26d69ca9d5ceafbf /crypto/des | |
| parent | Unclash clashing reason codes in ssl.h (diff) | |
| download | openssl-018fcbec38509cd03fb0709904a382c3bfcf5ed4.tar.xz openssl-018fcbec38509cd03fb0709904a382c3bfcf5ed4.zip | |
Fix gcc-7 warnings.
- Mostly missing fall thru comments
- And uninitialized value used in sslapitest.c
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3440)
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/des_locl.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h index 3c08ce8e08..f401e6f3eb 100644 --- a/crypto/des/des_locl.h +++ b/crypto/des/des_locl.h @@ -37,13 +37,20 @@ l1=l2=0; \ switch (n) { \ case 8: l2 =((DES_LONG)(*(--(c))))<<24L; \ + /* fall thru */ \ case 7: l2|=((DES_LONG)(*(--(c))))<<16L; \ + /* fall thru */ \ case 6: l2|=((DES_LONG)(*(--(c))))<< 8L; \ - case 5: l2|=((DES_LONG)(*(--(c)))); \ + /* fall thru */ \ + case 5: l2|=((DES_LONG)(*(--(c)))); \ + /* fall thru */ \ case 4: l1 =((DES_LONG)(*(--(c))))<<24L; \ + /* fall thru */ \ case 3: l1|=((DES_LONG)(*(--(c))))<<16L; \ + /* fall thru */ \ case 2: l1|=((DES_LONG)(*(--(c))))<< 8L; \ - case 1: l1|=((DES_LONG)(*(--(c)))); \ + /* fall thru */ \ + case 1: l1|=((DES_LONG)(*(--(c)))); \ } \ } @@ -72,12 +79,19 @@ c+=n; \ switch (n) { \ case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ + /* fall thru */ \ case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ + /* fall thru */ \ case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ + /* fall thru */ \ case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \ + /* fall thru */ \ case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ + /* fall thru */ \ case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ + /* fall thru */ \ case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ + /* fall thru */ \ case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \ } \ } |