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>
diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c index 4dc661f..78998a1 100644 --- a/crypto/des/str2key.c +++ b/crypto/des/str2key.c
@@ -14,7 +14,6 @@ { DES_key_schedule ks; int i, length; - register unsigned char j; memset(key, 0, 8); length = strlen(str); @@ -23,7 +22,8 @@ (*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 @@ { DES_key_schedule ks; int i, length; - register unsigned char j; memset(key1, 0, 8); memset(key2, 0, 8); @@ -66,7 +65,8 @@ } #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);
diff --git a/engines/e_chil.c b/engines/e_chil.c index c660aa9..8d81b46 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c
@@ -641,7 +641,7 @@ CRYPTO_THREAD_write_lock(chil_lock); BIO_free(logstream); logstream = NULL; - if (BIO_up_ref(bio) + if (BIO_up_ref(bio)) logstream = bio; else HWCRHKerr(HWCRHK_F_HWCRHK_CTRL, HWCRHK_R_BIO_WAS_FREED);