From a7e92a77da0fb320e096973088dcf616961bddb8 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Fri, 20 Jul 2018 07:07:27 +0000 Subject: [PATCH] Get rid of unused variables. copied_key and copied_salt are assigned with NULL and never used otherwise. Remove the two variables and related code. Reviewed by: pfg MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D16314 --- lib/libcrypt/crypt-sha256.c | 9 +-------- lib/libcrypt/crypt-sha512.c | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/lib/libcrypt/crypt-sha256.c b/lib/libcrypt/crypt-sha256.c index 6291fc12f2ad..d5b586789692 100644 --- a/lib/libcrypt/crypt-sha256.c +++ b/lib/libcrypt/crypt-sha256.c @@ -68,13 +68,10 @@ crypt_sha256(const char *key, const char *salt, char *buffer) uint8_t alt_result[32], temp_result[32]; SHA256_CTX ctx, alt_ctx; size_t salt_len, key_len, cnt, rounds; - char *cp, *copied_key, *copied_salt, *p_bytes, *s_bytes, *endp; + char *cp, *p_bytes, *s_bytes, *endp; const char *num; bool rounds_custom; - copied_key = NULL; - copied_salt = NULL; - /* Default number of rounds. */ rounds = ROUNDS_DEFAULT; rounds_custom = false; @@ -244,10 +241,6 @@ crypt_sha256(const char *key, const char *salt, char *buffer) memset(s_bytes, '\0', salt_len); memset(&ctx, '\0', sizeof(ctx)); memset(&alt_ctx, '\0', sizeof(alt_ctx)); - if (copied_key != NULL) - memset(copied_key, '\0', key_len); - if (copied_salt != NULL) - memset(copied_salt, '\0', salt_len); return (0); } diff --git a/lib/libcrypt/crypt-sha512.c b/lib/libcrypt/crypt-sha512.c index daa68a2132d0..e692ac5b2e4c 100644 --- a/lib/libcrypt/crypt-sha512.c +++ b/lib/libcrypt/crypt-sha512.c @@ -68,13 +68,10 @@ crypt_sha512(const char *key, const char *salt, char *buffer) uint8_t alt_result[64], temp_result[64]; SHA512_CTX ctx, alt_ctx; size_t salt_len, key_len, cnt, rounds; - char *cp, *copied_key, *copied_salt, *p_bytes, *s_bytes, *endp; + char *cp, *p_bytes, *s_bytes, *endp; const char *num; bool rounds_custom; - copied_key = NULL; - copied_salt = NULL; - /* Default number of rounds. */ rounds = ROUNDS_DEFAULT; rounds_custom = false; @@ -256,10 +253,6 @@ crypt_sha512(const char *key, const char *salt, char *buffer) memset(s_bytes, '\0', salt_len); memset(&ctx, '\0', sizeof(ctx)); memset(&alt_ctx, '\0', sizeof(alt_ctx)); - if (copied_key != NULL) - memset(copied_key, '\0', key_len); - if (copied_salt != NULL) - memset(copied_salt, '\0', salt_len); return (0); }