svn commit: r336540 - head/lib/libcrypt
Xin LI
delphij at FreeBSD.org
Fri Jul 20 07:07:29 UTC 2018
Author: delphij
Date: Fri Jul 20 07:07:27 2018
New Revision: 336540
URL: https://svnweb.freebsd.org/changeset/base/336540
Log:
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
Modified:
head/lib/libcrypt/crypt-sha256.c
head/lib/libcrypt/crypt-sha512.c
Modified: head/lib/libcrypt/crypt-sha256.c
==============================================================================
--- head/lib/libcrypt/crypt-sha256.c Fri Jul 20 07:01:28 2018 (r336539)
+++ head/lib/libcrypt/crypt-sha256.c Fri Jul 20 07:07:27 2018 (r336540)
@@ -68,13 +68,10 @@ crypt_sha256(const char *key, const char *salt, char *
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 *
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);
}
Modified: head/lib/libcrypt/crypt-sha512.c
==============================================================================
--- head/lib/libcrypt/crypt-sha512.c Fri Jul 20 07:01:28 2018 (r336539)
+++ head/lib/libcrypt/crypt-sha512.c Fri Jul 20 07:07:27 2018 (r336540)
@@ -68,13 +68,10 @@ crypt_sha512(const char *key, const char *salt, char *
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 *
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);
}
More information about the svn-src-all
mailing list