aboutsummaryrefslogtreecommitdiff
path: root/lib/libcrypt
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2018-07-20 07:07:27 +0000
committerXin LI <delphij@FreeBSD.org>2018-07-20 07:07:27 +0000
commita7e92a77da0fb320e096973088dcf616961bddb8 (patch)
treee216d37272c8013485fb8433640b5c0a75848a1f /lib/libcrypt
parent66bdf50face2485fdb7164cf563cbc595370cd3e (diff)
Notes
Diffstat (limited to 'lib/libcrypt')
-rw-r--r--lib/libcrypt/crypt-sha256.c9
-rw-r--r--lib/libcrypt/crypt-sha512.c9
2 files changed, 2 insertions, 16 deletions
diff --git a/lib/libcrypt/crypt-sha256.c b/lib/libcrypt/crypt-sha256.c
index 6291fc12f2ad9..d5b5867896925 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 daa68a2132d06..e692ac5b2e4cf 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);
}