blob: 2b6b1d301183829c66afc95d2436efbbb4d92428 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
https://bugs.php.net/bug.php?id=67512
--- php-5.6.19.orig/ext/standard/crypt.c
+++ php-5.6.19/ext/standard/crypt.c
@@ -58,6 +58,7 @@
#include "php_lcg.h"
#include "php_crypt.h"
#include "php_rand.h"
+#include "php_config.h"
/* The capabilities of the crypt() function is determined by the test programs
* run by configure from aclocal.m4. They will set PHP_STD_DES_CRYPT,
@@ -227,18 +228,20 @@
}
}
#else
-
-# if defined(HAVE_CRYPT_R) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
{
-# if defined(CRYPT_R_STRUCT_CRYPT_DATA)
+# if defined(HAVE_CRYPT_R)
+# if defined(CRYPT_R_STRUCT_CRYPT_DATA)
struct crypt_data buffer;
memset(&buffer, 0, sizeof(buffer));
-# elif defined(CRYPT_R_CRYPTD)
+# elif defined(CRYPT_R_CRYPTD)
CRYPTD buffer;
-# else
-# error Data struct used by crypt_r() is unknown. Please report.
-# endif
+# else
+# error Data struct used by crypt_r() is unknown. Please report.
+# endif
crypt_res = crypt_r(password, salt, &buffer);
+# else
+ crypt_res = crypt(passwrd, salt);
+#endif
if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
return FAILURE;
} else {
@@ -246,7 +249,6 @@
return SUCCESS;
}
}
-# endif
#endif
}
/* }}} */
|
