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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
/*
+----------------------------------------------------------------------+
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
| Copyright (c) 2007-2010 SektionEins GmbH |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Stefan Esser <sesser@sektioneins.de> |
+----------------------------------------------------------------------+
*/
/*
$Id: crypt.c,v 1.2 2008-01-04 11:23:47 sesser Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "php.h"
#include "php_ini.h"
#include "php_suhosin.h"
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_CRYPT_H
#include <crypt.h>
#endif
#if TM_IN_SYS_TIME
#include <sys/time.h>
#else
#include <time.h>
#endif
#if HAVE_STRING_H
#include <string.h>
#else
#include <strings.h>
#endif
#ifdef PHP_WIN32
#include <process.h>
extern char *crypt(char *__key, char *__salt);
#endif
#include "ext/standard/php_lcg.h"
#include "ext/standard/php_crypt.h"
#include "ext/standard/php_rand.h"
#define PHP_CRYPT_RAND php_rand(TSRMLS_C)
#define BLOWFISH_SALT_LEN 60
#ifdef ZTS
static MUTEX_T suhosin_crypt_mutex;
#endif
static int CRYPT_MD5 = 0;
char *suhosin_crypt_blowfish_rn(char *key, char *setting, char *output, int size);
char *suhosin_crypt_gensalt_blowfish_rn(unsigned long count, char *input, int size, char *output, int output_size);
static unsigned char itoa64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
static void php_to64(char *s, long v, int n)
{
while (--n >= 0) {
*s++ = itoa64[v&0x3f];
v >>= 6;
}
}
/* {{{ proto string crypt(string str [, string salt])
Encrypt a string */
static PHP_FUNCTION(suhosin_crypt)
{
char salt[BLOWFISH_SALT_LEN+1];
char *str, *salt_in = NULL;
int str_len, salt_in_len;
salt[0]=salt[BLOWFISH_SALT_LEN]='\0';
/* This will produce suitable results if people depend on DES-encryption
available (passing always 2-character salt). At least for glibc6.1 */
memset(&salt[1], '$', BLOWFISH_SALT_LEN-1);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &str, &str_len,
&salt_in, &salt_in_len) == FAILURE) {
return;
}
if (salt_in) {
memcpy(salt, salt_in, MIN(BLOWFISH_SALT_LEN, salt_in_len));
}
/* The automatic salt generation only covers standard DES and md5-crypt */
if(!*salt) {
if (CRYPT_MD5) {
strcpy(salt, "$1$");
php_to64(&salt[3], PHP_CRYPT_RAND, 4);
php_to64(&salt[7], PHP_CRYPT_RAND, 4);
strcpy(&salt[11], "$");
} else {
php_to64(&salt[0], PHP_CRYPT_RAND, 2);
salt[2] = '\0';
}
}
if (salt[0] == '$' &&
salt[1] == '2' &&
salt[2] == 'a' &&
salt[3] == '$' &&
salt[4] >= '0' && salt[4] <= '3' &&
salt[5] >= '0' && salt[5] <= '9' &&
salt[6] == '$') {
char output[BLOWFISH_SALT_LEN+1];
output[0] = 0;
suhosin_crypt_blowfish_rn(str, salt, output, sizeof(output));
RETVAL_STRING(output, 1);
} else {
#ifdef ZTS
tsrm_mutex_lock(suhosin_crypt_mutex);
#endif
RETVAL_STRING(crypt(str, salt), 1);
#ifdef ZTS
tsrm_mutex_unlock(suhosin_crypt_mutex);
#endif
}
}
/* }}} */
/* {{{ suhosin_crypt_functions[]
*/
static function_entry suhosin_crypt_functions[] = {
PHP_NAMED_FE(crypt, PHP_FN(suhosin_crypt), NULL)
{NULL, NULL, NULL}
};
/* }}} */
void suhosin_hook_crypt()
{
zend_constant *c;
TSRMLS_FETCH();
/* check if we have MD5 support */
if (zend_hash_find(EG(zend_constants), "CRYPT_MD5", sizeof("CRYPT_MD5"), (void **) &c) == SUCCESS) {
if (c->value.type == IS_LONG && c->value.value.lval > 0) {
CRYPT_MD5 = 1;
}
}
/* check if we already have blowfish support */
if (zend_hash_find(EG(zend_constants), "CRYPT_BLOWFISH", sizeof("CRYPT_BLOWFISH"), (void **) &c) == FAILURE) {
/* should we just bailout when this constant is not known at all? */
return;
}
if (c->value.type == IS_LONG && c->value.value.lval > 0) {
/* blowfish support already installed */
return;
}
/* mark blowfish as supported */
c->value.type = IS_LONG;
c->value.value.lval = 1;
/* now fix the CRYPT_SALT_LENGTH constant */
if (zend_hash_find(EG(zend_constants), "CRYPT_SALT_LENGTH", sizeof("CRYPT_SALT_LENGTH"), (void **) &c) == SUCCESS) {
c->value.type = IS_LONG;
c->value.value.lval = BLOWFISH_SALT_LEN;
}
#ifdef ZTS
suhosin_crypt_mutex = tsrm_mutex_alloc();
#endif
/* replace the crypt() function */
zend_hash_del(CG(function_table), "crypt", sizeof("crypt"));
#ifndef ZEND_ENGINE_2
zend_register_functions(suhosin_crypt_functions, NULL, MODULE_PERSISTENT TSRMLS_CC);
#else
zend_register_functions(NULL, suhosin_crypt_functions, NULL, MODULE_PERSISTENT TSRMLS_CC);
#endif
}
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
|
