From eb774aff170b3ea671dacaf50aee5595cce1ae9a Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Sat, 17 May 2014 18:34:23 +0200 Subject: CRYPTO: Use unprefixed version of function stpncpy glibc contains two versions of finction stpncpy sh-4.2$ nm --dynamic --defined-only /lib64/libc.so.6 | grep stpncpy 0000003ce1c89b00 i stpncpy 0000003ce1c89b00 i __stpncpy 0000003ce1d040a0 T __stpncpy_chk We should use more portable version of stpncpy without prefix with underscores. The function __stpncpy was used in initial veersion e65c65fc710fa030bfb8319efc43fcdc9ce5a26f, which was based on http://people.redhat.com/drepper/SHA-crypt.txt Reviewed-by: Jakub Hrozek (cherry picked from commit 83e1ea9e24aabe6ade180649ecfc9c253ad19395) --- src/util/crypto/libcrypto/crypto_sha512crypt.c | 4 ++-- src/util/crypto/nss/nss_sha512crypt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/util/crypto/libcrypto/crypto_sha512crypt.c b/src/util/crypto/libcrypto/crypto_sha512crypt.c index 88628b686..34547d08a 100644 --- a/src/util/crypto/libcrypto/crypto_sha512crypt.c +++ b/src/util/crypto/libcrypto/crypto_sha512crypt.c @@ -266,7 +266,7 @@ static int sha512_crypt_r(const char *key, goto done; } - cp = __stpncpy(buffer, sha512_salt_prefix, SALT_PREF_SIZE); + cp = stpncpy(buffer, sha512_salt_prefix, SALT_PREF_SIZE); buflen -= SALT_PREF_SIZE; if (rounds_custom) { @@ -284,7 +284,7 @@ static int sha512_crypt_r(const char *key, ret = ERANGE; goto done; } - cp = __stpncpy(cp, salt, salt_len); + cp = stpncpy(cp, salt, salt_len); *cp++ = '$'; buflen -= salt_len + 1; diff --git a/src/util/crypto/nss/nss_sha512crypt.c b/src/util/crypto/nss/nss_sha512crypt.c index 2838c4716..9fedd5ec6 100644 --- a/src/util/crypto/nss/nss_sha512crypt.c +++ b/src/util/crypto/nss/nss_sha512crypt.c @@ -267,7 +267,7 @@ static int sha512_crypt_r(const char *key, goto done; } - cp = __stpncpy(buffer, sha512_salt_prefix, SALT_PREF_SIZE); + cp = stpncpy(buffer, sha512_salt_prefix, SALT_PREF_SIZE); buflen -= SALT_PREF_SIZE; if (rounds_custom) { @@ -285,7 +285,7 @@ static int sha512_crypt_r(const char *key, ret = ERANGE; goto done; } - cp = __stpncpy(cp, salt, salt_len); + cp = stpncpy(cp, salt, salt_len); *cp++ = '$'; buflen -= salt_len + 1; -- cgit