diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-06-07 10:54:42 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-07 11:08:33 -0400 |
| commit | 56989dcd0e208dcad204e85367a20fab2a45e2f8 (patch) | |
| tree | a3272547426c2ab95408f8766ab9a6852335eed4 /crypto/des | |
| parent | 47ae05ba6288c831a9aa4282f9cce40372e79ea9 (diff) | |
Fix some GitHub issues.
GH1180: Local variable sometimes unused
GH1181: Missing close paren.
Thanks to <wipedout@yandex.ru> for reporting these.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/str2key.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c index 4dc661f467..78998a1cd0 100644 --- a/crypto/des/str2key.c +++ b/crypto/des/str2key.c @@ -14,7 +14,6 @@ void DES_string_to_key(const char *str, DES_cblock *key) { DES_key_schedule ks; int i, length; - register unsigned char j; memset(key, 0, 8); length = strlen(str); @@ -23,7 +22,8 @@ void DES_string_to_key(const char *str, DES_cblock *key) (*key)[i % 8] ^= (str[i] << 1); #else /* MIT COMPATIBLE */ for (i = 0; i < length; i++) { - j = str[i]; + register unsigned char j = str[i]; + if ((i % 16) < 8) (*key)[i % 8] ^= (j << 1); else { @@ -46,7 +46,6 @@ void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2) { DES_key_schedule ks; int i, length; - register unsigned char j; memset(key1, 0, 8); memset(key2, 0, 8); @@ -66,7 +65,8 @@ void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2) } #else /* MIT COMPATIBLE */ for (i = 0; i < length; i++) { - j = str[i]; + register unsigned char j = str[i]; + if ((i % 32) < 16) { if ((i % 16) < 8) (*key1)[i % 8] ^= (j << 1); |