diff options
| author | Pierre Joye <pajoye@php.net> | 2010-06-15 13:50:14 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-06-15 13:50:14 +0000 |
| commit | b8613c10abd67fb051ad406cb63e29397fa791d6 (patch) | |
| tree | 8ca731ae19d2dbff1ab4dd905e1a7c7a672664a2 /ext/standard/php_crypt_r.c | |
| parent | f27e17d18c4a224b9dfc6c861c555759cd69240c (diff) | |
| download | php-git-b8613c10abd67fb051ad406cb63e29397fa791d6.tar.gz | |
- cleanup, no vc6 support in trunk
Diffstat (limited to 'ext/standard/php_crypt_r.c')
| -rw-r--r-- | ext/standard/php_crypt_r.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c index 2fee5feb0f..4872c49599 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -210,19 +210,12 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) { memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); -#if _MSC_VER >= 1500 if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, sp, sl + 1) != 0) { goto _destroyCtx1; } passwd[MD5_MAGIC_LEN + sl] = '\0'; strcat_s(passwd, MD5_HASH_MAX_LEN, "$"); -#else - /* VC6 version doesn't have strcat_s or strncpy_s */ - if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) < sl) { - goto _destroyCtx1; - } - strcat(passwd, "$"); -#endif + dwHashLen = 16; /* Fetch the ctx hash value */ |