From 560ed89bfbb56526251e9bd2fbcb27e5932641d8 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Fri, 11 Dec 2009 15:57:01 +0000 Subject: - #50334, use our own implementations of stpncpy and mempcy, avoiding weird behaviors on certain platforms like solaris --- ext/standard/crypt_sha256.c | 16 ++++++---------- ext/standard/crypt_sha512.c | 18 ++++++------------ 2 files changed, 12 insertions(+), 22 deletions(-) (limited to 'ext') diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c index dc2c4ce20c..7f93e582d9 100644 --- a/ext/standard/crypt_sha256.c +++ b/ext/standard/crypt_sha256.c @@ -40,8 +40,7 @@ # endif #endif -#ifndef HAVE_STRPNCPY -char * stpncpy(char *dst, const char *src, size_t len) +char * __php_stpncpy(char *dst, const char *src, size_t len) { size_t n = strlen(src); if (n > len) { @@ -49,14 +48,11 @@ char * stpncpy(char *dst, const char *src, size_t len) } return strncpy(dst, src, len) + n; } -#endif -#ifndef HAVE_MEMPCPY -void * mempcpy(void * dst, const void * src, size_t len) +void * __php_mempcpy(void * dst, const void * src, size_t len) { return (((char *)memcpy(dst, src, len)) + len); } -#endif #ifndef MIN # define MIN(a, b) (((a) < (b)) ? (a) : (b)) @@ -457,7 +453,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b /* Create byte sequence P. */ cp = p_bytes = alloca(key_len); for (cnt = key_len; cnt >= 32; cnt -= 32) { - cp = mempcpy((void *)cp, (const void *)temp_result, 32); + cp = __php_mempcpy((void *)cp, (const void *)temp_result, 32); } memcpy(cp, temp_result, cnt); @@ -475,7 +471,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b /* Create byte sequence S. */ cp = s_bytes = alloca(salt_len); for (cnt = salt_len; cnt >= 32; cnt -= 32) { - cp = mempcpy(cp, temp_result, 32); + cp = __php_mempcpy(cp, temp_result, 32); } memcpy(cp, temp_result, cnt); @@ -515,7 +511,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b /* Now we can construct the result string. It consists of three parts. */ - cp = stpncpy(buffer, sha256_salt_prefix, MAX(0, buflen)); + cp = __php_stpncpy(buffer, sha256_salt_prefix, MAX(0, buflen)); buflen -= sizeof(sha256_salt_prefix) - 1; if (rounds_custom) { @@ -528,7 +524,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b buflen -= n; } - cp = stpncpy(cp, salt, MIN ((size_t) MAX (0, buflen), salt_len)); + cp = __php_stpncpy(cp, salt, MIN ((size_t) MAX (0, buflen), salt_len)); buflen -= MIN((size_t) MAX (0, buflen), salt_len); if (buflen > 0) { diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c index cdf8851684..67244ef54b 100644 --- a/ext/standard/crypt_sha512.c +++ b/ext/standard/crypt_sha512.c @@ -32,20 +32,14 @@ # include # include # if HAVE_STRING_H -# define __USE_GNU # include # else # include # endif #endif -#ifndef HAVE_MEMPCPY -extern void * mempcpy(void * dst, const void * src, size_t len); -#endif - -#ifndef HAVE_STRPNCPY -extern char * stpncpy(char *dst, const char *src, size_t len); -#endif +extern void * __php_mempcpy(void * dst, const void * src, size_t len); +extern char * __php_stpncpy(char *dst, const char *src, size_t len); #ifndef MIN # define MIN(a, b) (((a) < (b)) ? (a) : (b)) @@ -488,7 +482,7 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen) /* Create byte sequence P. */ cp = p_bytes = alloca(key_len); for (cnt = key_len; cnt >= 64; cnt -= 64) { - cp = mempcpy((void *) cp, (const void *)temp_result, 64); + cp = __php_mempcpy((void *) cp, (const void *)temp_result, 64); } memcpy(cp, temp_result, cnt); @@ -507,7 +501,7 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen) /* Create byte sequence S. */ cp = s_bytes = alloca(salt_len); for (cnt = salt_len; cnt >= 64; cnt -= 64) { - cp = mempcpy(cp, temp_result, 64); + cp = __php_mempcpy(cp, temp_result, 64); } memcpy(cp, temp_result, cnt); @@ -547,7 +541,7 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen) /* Now we can construct the result string. It consists of three parts. */ - cp = stpncpy(buffer, sha512_salt_prefix, MAX(0, buflen)); + cp = __php_stpncpy(buffer, sha512_salt_prefix, MAX(0, buflen)); buflen -= sizeof(sha512_salt_prefix) - 1; if (rounds_custom) { @@ -560,7 +554,7 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen) buflen -= n; } - cp = stpncpy(cp, salt, MIN((size_t) MAX(0, buflen), salt_len)); + cp = __php_stpncpy(cp, salt, MIN((size_t) MAX(0, buflen), salt_len)); buflen -= (int) MIN((size_t) MAX(0, buflen), salt_len); if (buflen > 0) { -- cgit v1.2.1