From: Pierre Joye <pajoye@php.net>
Date: Tue, 15 Jun 2010 13:50:14 +0000 (+0000)
Subject: - cleanup, no vc6 support in trunk
X-Git-Tag: php-5.4.0alpha1~191^2~1287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8613c10abd67fb051ad406cb63e29397fa791d6;p=php

- cleanup, no vc6 support in trunk
---

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 */