|
[-]
[+]
|
Added |
php5-suhosin.changes
|
|
|
|
[-]
[+]
|
Changed |
php5-suhosin.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.29.tgz/crypt.c
^
|
| @@ -1,214 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | Suhosin Version 1 |
- +----------------------------------------------------------------------+
- | Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 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
- */
-
-
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.29.tgz/crypt_blowfish.c
^
|
| @@ -1,751 +0,0 @@
-/*
- $Id: crypt_blowfish.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $
-*/
-/*
- * This code comes from John the Ripper password cracker, with reentrant
- * and crypt(3) interfaces added, but optimizations specific to password
- * cracking removed.
- *
- * Written by Solar Designer <solar at openwall.com> in 1998-2002 and
- * placed in the public domain.
- *
- * There's absolutely no warranty.
- *
- * It is my intent that you should be able to use this on your system,
- * as a part of a software package, or anywhere else to improve security,
- * ensure compatibility, or for any other purpose. I would appreciate
- * it if you give credit where it is due and keep your modifications in
- * the public domain as well, but I don't require that in order to let
- * you place this code and any modifications you make under a license
- * of your choice.
- *
- * This implementation is compatible with OpenBSD bcrypt.c (version 2a)
- * by Niels Provos <provos at citi.umich.edu>, and uses some of his
- * ideas. The password hashing algorithm was designed by David Mazieres
- * <dm at lcs.mit.edu>.
- *
- * There's a paper on the algorithm that explains its design decisions:
- *
- * http://www.usenix.org/events/usenix99/provos.html
- *
- * Some of the tricks in BF_ROUND might be inspired by Eric Young's
- * Blowfish library (I can't be sure if I would think of something if I
- * hadn't seen his code).
- */
-
-#include <string.h>
-
-#include <errno.h>
-#ifndef __set_errno
-#define __set_errno(val) errno = (val)
-#endif
-
-#undef __CONST
-#ifdef __GNUC__
-#define __CONST __const
-#else
-#define __CONST
-#endif
-
-#ifdef __i386__
-#define BF_ASM 0
-#define BF_SCALE 1
-#elif defined(__alpha__) || defined(__hppa__)
-#define BF_ASM 0
-#define BF_SCALE 1
-#else
-#define BF_ASM 0
-#define BF_SCALE 0
-#endif
-
-typedef unsigned int BF_word;
-
-/* Number of Blowfish rounds, this is also hardcoded into a few places */
-#define BF_N 16
-
-typedef BF_word BF_key[BF_N + 2];
-
-typedef struct {
- BF_word S[4][0x100];
- BF_key P;
-} BF_ctx;
-
-/*
- * Magic IV for 64 Blowfish encryptions that we do at the end.
- * The string is "OrpheanBeholderScryDoubt" on big-endian.
- */
-static BF_word BF_magic_w[6] = {
- 0x4F727068, 0x65616E42, 0x65686F6C,
- 0x64657253, 0x63727944, 0x6F756274
-};
-
-/*
- * P-box and S-box tables initialized with digits of Pi.
- */
-static BF_ctx BF_init_state = {
- {
- {
- 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
- 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
- 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
- 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
- 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
- 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
- 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
- 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
- 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
- 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
- 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
- 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
- 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
- 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
- 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
- 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
- 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
- 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
- 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
- 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
- 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
- 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
- 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
- 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
- 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
- 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
- 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
- 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
- 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
- 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
- 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
- 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
- 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
- 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
- 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
- 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
- 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
- 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
- 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
- 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
- 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
- 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
- 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
- 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
- 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
- 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
- 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
- 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
- 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
- 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
- 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
- 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
- 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
- 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
- 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
- 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
- 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
- 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
- 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
- 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
- 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
- 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
- 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
- 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
- }, {
- 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
- 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
- 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
- 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
- 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
- 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
- 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
- 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
- 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
- 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
- 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
- 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
- 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
- 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
- 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
- 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
- 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
- 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
- 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
- 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
- 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
- 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
- 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
- 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
- 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
- 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
- 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
- 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
- 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
- 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
- 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
- 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
- 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
- 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
- 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
- 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
- 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
- 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
- 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
- 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
- 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
- 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
- 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
- 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
- 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
- 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
- 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
- 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
- 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
- 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
- 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
- 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
- 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
- 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
- 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
- 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
- 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
- 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
- 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
- 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
- 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
- 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
- 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
- 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
- }, {
- 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
- 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
- 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
- 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
- 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
- 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
- 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
- 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
- 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
- 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
- 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
- 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
- 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
- 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
- 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
- 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
- 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
- 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
- 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
- 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
- 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
- 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
- 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
- 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
- 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
- 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
- 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
- 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
- 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
- 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
- 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
- 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
- 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
- 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
- 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
- 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
- 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
- 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
- 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
- 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
- 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
- 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
- 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
- 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
- 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
- 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
- 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
- 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
- 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
- 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
- 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
- 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
- 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
- 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
- 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
- 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
- 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
- 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
- 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
- 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
- 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
- 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
- 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
- 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
- }, {
- 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
- 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
- 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
- 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
- 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
- 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
- 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
- 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
- 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
- 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
- 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
- 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
- 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
- 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
- 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
- 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
- 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
- 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
- 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
- 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
- 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
- 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
- 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
- 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
- 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
- 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
- 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
- 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
- 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
- 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
- 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
- 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
- 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
- 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
- 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
- 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
- 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
- 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
- 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
- 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
- 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
- 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
- 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
- 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
- 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
- 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
- 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
- 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
- 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
- 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
- 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
- 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
- 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
- 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
- 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
- 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
- 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
- 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
- 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
- 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
- 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
- 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
- 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
- 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
- }
- }, {
- 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
- 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
- 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
- 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
- 0x9216d5d9, 0x8979fb1b
- }
-};
-
-static unsigned char BF_itoa64[64 + 1] =
- "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-static unsigned char BF_atoi64[0x60] = {
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
- 64, 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, 64, 64, 64, 64, 64,
- 64, 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, 64, 64, 64, 64, 64
-};
-
-/*
- * This may be optimized out if built with function inlining and no BF_ASM.
- */
-static void clean(void *data, int size)
-{
-#if BF_ASM
- extern void _BF_clean(void *data);
-#endif
- memset(data, 0, size);
-#if BF_ASM
- _BF_clean(data);
-#endif
-}
-
-#define BF_safe_atoi64(dst, src) \
-{ \
- tmp = (unsigned char)(src); \
- if (tmp == '$') break; \
- if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
- tmp = BF_atoi64[tmp]; \
- if (tmp > 63) return -1; \
- (dst) = tmp; \
-}
-
-static int BF_decode(BF_word *dst, __CONST char *src, int size)
-{
- unsigned char *dptr = (unsigned char *)dst;
- unsigned char *end = dptr + size;
- unsigned char *sptr = (unsigned char *)src;
- unsigned int tmp, c1, c2, c3, c4;
-
- do {
- BF_safe_atoi64(c1, *sptr++);
- BF_safe_atoi64(c2, *sptr++);
- *dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4);
- if (dptr >= end) break;
-
- BF_safe_atoi64(c3, *sptr++);
- *dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2);
- if (dptr >= end) break;
-
- BF_safe_atoi64(c4, *sptr++);
- *dptr++ = ((c3 & 0x03) << 6) | c4;
- } while (dptr < end);
-
- while (dptr < end)
- *dptr++ = 0;
-
- return 0;
-}
-
-static void BF_encode(char *dst, __CONST BF_word *src, int size)
-{
- unsigned char *sptr = (unsigned char *)src;
- unsigned char *end = sptr + size;
- unsigned char *dptr = (unsigned char *)dst;
- unsigned int c1, c2;
-
- do {
- c1 = *sptr++;
- *dptr++ = BF_itoa64[c1 >> 2];
- c1 = (c1 & 0x03) << 4;
- if (sptr >= end) {
- *dptr++ = BF_itoa64[c1];
- break;
- }
-
- c2 = *sptr++;
- c1 |= c2 >> 4;
- *dptr++ = BF_itoa64[c1];
- c1 = (c2 & 0x0f) << 2;
- if (sptr >= end) {
- *dptr++ = BF_itoa64[c1];
- break;
- }
-
- c2 = *sptr++;
- c1 |= c2 >> 6;
- *dptr++ = BF_itoa64[c1];
- *dptr++ = BF_itoa64[c2 & 0x3f];
- } while (sptr < end);
-}
-
-static void BF_swap(BF_word *x, int count)
-{
- static int endianness_check = 1;
- char *is_little_endian = (char *)&endianness_check;
- BF_word tmp;
-
- if (*is_little_endian)
- do {
- tmp = *x;
- tmp = (tmp << 16) | (tmp >> 16);
- *x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF);
- } while (--count);
-}
-
-#if BF_SCALE
-/* Architectures which can shift addresses left by 2 bits with no extra cost */
-#define BF_ROUND(L, R, N) \
- tmp1 = L & 0xFF; \
- tmp2 = L >> 8; \
- tmp2 &= 0xFF; \
- tmp3 = L >> 16; \
- tmp3 &= 0xFF; \
- tmp4 = L >> 24; \
- tmp1 = data.ctx.S[3][tmp1]; \
- tmp2 = data.ctx.S[2][tmp2]; \
- tmp3 = data.ctx.S[1][tmp3]; \
- tmp3 += data.ctx.S[0][tmp4]; \
- tmp3 ^= tmp2; \
- R ^= data.ctx.P[N + 1]; \
- tmp3 += tmp1; \
- R ^= tmp3;
-#else
-/* Architectures with no complicated addressing modes supported */
-#define BF_INDEX(S, i) \
- (*((BF_word *)(((unsigned char *)S) + (i))))
-#define BF_ROUND(L, R, N) \
- tmp1 = L & 0xFF; \
- tmp1 <<= 2; \
- tmp2 = L >> 6; \
- tmp2 &= 0x3FC; \
- tmp3 = L >> 14; \
- tmp3 &= 0x3FC; \
- tmp4 = L >> 22; \
- tmp4 &= 0x3FC; \
- tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \
- tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \
- tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \
- tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \
- tmp3 ^= tmp2; \
- R ^= data.ctx.P[N + 1]; \
- tmp3 += tmp1; \
- R ^= tmp3;
-#endif
-
-/*
- * Encrypt one block, BF_N is hardcoded here.
- */
-#define BF_ENCRYPT \
- L ^= data.ctx.P[0]; \
- BF_ROUND(L, R, 0); \
- BF_ROUND(R, L, 1); \
- BF_ROUND(L, R, 2); \
- BF_ROUND(R, L, 3); \
- BF_ROUND(L, R, 4); \
- BF_ROUND(R, L, 5); \
- BF_ROUND(L, R, 6); \
- BF_ROUND(R, L, 7); \
- BF_ROUND(L, R, 8); \
- BF_ROUND(R, L, 9); \
- BF_ROUND(L, R, 10); \
- BF_ROUND(R, L, 11); \
- BF_ROUND(L, R, 12); \
- BF_ROUND(R, L, 13); \
- BF_ROUND(L, R, 14); \
- BF_ROUND(R, L, 15); \
- tmp4 = R; \
- R = L; \
- L = tmp4 ^ data.ctx.P[BF_N + 1];
-
-#if BF_ASM
-#define BF_body() \
- _BF_body_r(&data.ctx);
-#else
-#define BF_body() \
- L = R = 0; \
- ptr = data.ctx.P; \
- do { \
- ptr += 2; \
- BF_ENCRYPT; \
- *(ptr - 2) = L; \
- *(ptr - 1) = R; \
- } while (ptr < &data.ctx.P[BF_N + 2]); \
-\
- ptr = data.ctx.S[0]; \
- do { \
- ptr += 2; \
- BF_ENCRYPT; \
- *(ptr - 2) = L; \
- *(ptr - 1) = R; \
- } while (ptr < &data.ctx.S[3][0xFF]);
-#endif
-
-static void BF_set_key(__CONST char *key, BF_key expanded, BF_key initial)
-{
- __CONST char *ptr = key;
- int i, j;
- BF_word tmp;
-
- for (i = 0; i < BF_N + 2; i++) {
- tmp = 0;
- for (j = 0; j < 4; j++) {
- tmp <<= 8;
- tmp |= *ptr;
-
- if (!*ptr) ptr = key; else ptr++;
- }
-
- expanded[i] = tmp;
- initial[i] = BF_init_state.P[i] ^ tmp;
- }
-}
-
-char *suhosin_crypt_blowfish_rn(__CONST char *key, __CONST char *setting,
- char *output, int size)
-{
-#if BF_ASM
- extern void _BF_body_r(BF_ctx *ctx);
-#endif
- struct {
- BF_ctx ctx;
- BF_key expanded_key;
- union {
- BF_word salt[4];
- BF_word output[6];
- } binary;
- } data;
- BF_word L, R;
- BF_word tmp1, tmp2, tmp3, tmp4;
- BF_word *ptr;
- BF_word count;
- int i;
-
- if (size < 7 + 22 + 31 + 1) {
- __set_errno(ERANGE);
- return NULL;
- }
-
- if (setting[0] != '$' ||
- setting[1] != '2' ||
- setting[2] != 'a' ||
- setting[3] != '$' ||
- setting[4] < '0' || setting[4] > '3' ||
- setting[5] < '0' || setting[5] > '9' ||
- setting[6] != '$') {
- __set_errno(EINVAL);
- return NULL;
- }
-
- count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
- if (count < 16 || BF_decode(data.binary.salt, &setting[7], 16)) {
- clean(data.binary.salt, sizeof(data.binary.salt));
- __set_errno(EINVAL);
- return NULL;
- }
-
- BF_swap(data.binary.salt, 4);
-
- BF_set_key(key, data.expanded_key, data.ctx.P);
-
- memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
-
- L = R = 0;
- for (i = 0; i < BF_N + 2; i += 2) {
- L ^= data.binary.salt[i & 2];
- R ^= data.binary.salt[(i & 2) + 1];
- BF_ENCRYPT;
- data.ctx.P[i] = L;
- data.ctx.P[i + 1] = R;
- }
-
- ptr = data.ctx.S[0];
- do {
- ptr += 4;
- L ^= data.binary.salt[(BF_N + 2) & 3];
- R ^= data.binary.salt[(BF_N + 3) & 3];
- BF_ENCRYPT;
- *(ptr - 4) = L;
- *(ptr - 3) = R;
-
- L ^= data.binary.salt[(BF_N + 4) & 3];
- R ^= data.binary.salt[(BF_N + 5) & 3];
- BF_ENCRYPT;
- *(ptr - 2) = L;
- *(ptr - 1) = R;
- } while (ptr < &data.ctx.S[3][0xFF]);
-
- do {
- data.ctx.P[0] ^= data.expanded_key[0];
- data.ctx.P[1] ^= data.expanded_key[1];
- data.ctx.P[2] ^= data.expanded_key[2];
- data.ctx.P[3] ^= data.expanded_key[3];
- data.ctx.P[4] ^= data.expanded_key[4];
- data.ctx.P[5] ^= data.expanded_key[5];
- data.ctx.P[6] ^= data.expanded_key[6];
- data.ctx.P[7] ^= data.expanded_key[7];
- data.ctx.P[8] ^= data.expanded_key[8];
- data.ctx.P[9] ^= data.expanded_key[9];
- data.ctx.P[10] ^= data.expanded_key[10];
- data.ctx.P[11] ^= data.expanded_key[11];
- data.ctx.P[12] ^= data.expanded_key[12];
- data.ctx.P[13] ^= data.expanded_key[13];
- data.ctx.P[14] ^= data.expanded_key[14];
- data.ctx.P[15] ^= data.expanded_key[15];
- data.ctx.P[16] ^= data.expanded_key[16];
- data.ctx.P[17] ^= data.expanded_key[17];
-
- BF_body();
-
- tmp1 = data.binary.salt[0];
- tmp2 = data.binary.salt[1];
- tmp3 = data.binary.salt[2];
- tmp4 = data.binary.salt[3];
- data.ctx.P[0] ^= tmp1;
- data.ctx.P[1] ^= tmp2;
- data.ctx.P[2] ^= tmp3;
- data.ctx.P[3] ^= tmp4;
- data.ctx.P[4] ^= tmp1;
- data.ctx.P[5] ^= tmp2;
- data.ctx.P[6] ^= tmp3;
- data.ctx.P[7] ^= tmp4;
- data.ctx.P[8] ^= tmp1;
- data.ctx.P[9] ^= tmp2;
- data.ctx.P[10] ^= tmp3;
- data.ctx.P[11] ^= tmp4;
- data.ctx.P[12] ^= tmp1;
- data.ctx.P[13] ^= tmp2;
- data.ctx.P[14] ^= tmp3;
- data.ctx.P[15] ^= tmp4;
- data.ctx.P[16] ^= tmp1;
- data.ctx.P[17] ^= tmp2;
-
- BF_body();
- } while (--count);
-
- for (i = 0; i < 6; i += 2) {
- L = BF_magic_w[i];
- R = BF_magic_w[i + 1];
-
- count = 64;
- do {
- BF_ENCRYPT;
- } while (--count);
-
- data.binary.output[i] = L;
- data.binary.output[i + 1] = R;
- }
-
- memcpy(output, setting, 7 + 22 - 1);
- output[7 + 22 - 1] = BF_itoa64[(int)
- BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30];
-
-/* This has to be bug-compatible with the original implementation, so
- * only encode 23 of the 24 bytes. :-) */
- BF_swap(data.binary.output, 6);
- BF_encode(&output[7 + 22], data.binary.output, 23);
- output[7 + 22 + 31] = '\0';
-
-/* Overwrite the most obvious sensitive data we have on the stack. Note
- * that this does not guarantee there's no sensitive data left on the
- * stack and/or in registers; I'm not aware of portable code that does. */
- clean(&data, sizeof(data));
-
- return output;
-}
-
-char *suhosin_crypt_gensalt_blowfish_rn(unsigned long count,
- __CONST char *input, int size, char *output, int output_size)
-{
- if (size < 16 || output_size < 7 + 22 + 1 ||
- (count && (count < 4 || count > 31))) {
- if (output_size > 0) output[0] = '\0';
- __set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
- return NULL;
- }
-
- if (!count) count = 5;
-
- output[0] = '$';
- output[1] = '2';
- output[2] = 'a';
- output[3] = '$';
- output[4] = '0' + count / 10;
- output[5] = '0' + count % 10;
- output[6] = '$';
-
- BF_encode(&output[7], (BF_word *)input, 16);
- output[7 + 22] = '\0';
-
- return output;
-}
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.29.tgz/crypt_md5.c
^
|
| @@ -1,163 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2006 The PHP Group |
- +----------------------------------------------------------------------+
- | 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: Edin Kadribasic |
- +----------------------------------------------------------------------+
- */
-
-/* $Id: crypt_md5.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ */
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * from FreeBSD: crypt.c,v 1.5 1996/10/14 08:34:02 phk Exp
- * via OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp
- * via NetBSD: md5crypt.c,v 1.4.2.1 2002/01/22 19:31:59 he Exp
- *
- */
-
-#include "php.h"
-#include "ext/standard/md5.h"
-#include "crypt_md5.h"
-
-static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */
- "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-static void to64(char *, php_uint32, int);
-
-static void
-to64(char *s, php_uint32 v, int n)
-{
-
- while (--n >= 0) {
- *s++ = itoa64[v & 0x3f];
- v >>= 6;
- }
-}
-
-/*
- * MD5 password encryption.
- */
-char *
-md5_crypt(const char *pw, const char *salt)
-{
- static char passwd[120], *p;
- const char *sp, *ep;
- unsigned char final[16];
- unsigned int i, sl, pwl;
- PHP_MD5_CTX ctx, ctx1;
- php_uint32 l;
- int pl;
-
- pwl = strlen(pw);
-
- /* Refine the salt first */
- sp = salt;
-
- /* If it starts with the magic string, then skip that */
- if (strncmp(sp, MD5_MAGIC, MD5_MAGIC_LEN) == 0)
- sp += MD5_MAGIC_LEN;
-
- /* It stops at the first '$', max 8 chars */
- for (ep = sp; *ep != '\0' && *ep != '$' && ep < (sp + 8); ep++)
- continue;
-
- /* get the length of the true salt */
- sl = ep - sp;
-
- PHP_MD5Init(&ctx);
-
- /* The password first, since that is what is most unknown */
- PHP_MD5Update(&ctx, (const unsigned char *)pw, pwl);
-
- /* Then our magic string */
- PHP_MD5Update(&ctx, (const unsigned char *)MD5_MAGIC, MD5_MAGIC_LEN);
-
- /* Then the raw salt */
- PHP_MD5Update(&ctx, (const unsigned char *)sp, sl);
-
- /* Then just as many characters of the MD5(pw,salt,pw) */
- PHP_MD5Init(&ctx1);
- PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl);
- PHP_MD5Update(&ctx1, (const unsigned char *)sp, sl);
- PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl);
- PHP_MD5Final(final, &ctx1);
-
- for (pl = pwl; pl > 0; pl -= 16)
- PHP_MD5Update(&ctx, final, (unsigned int)(pl > 16 ? 16 : pl));
-
- /* Don't leave anything around in vm they could use. */
- memset(final, 0, sizeof(final));
-
- /* Then something really weird... */
- for (i = pwl; i != 0; i >>= 1)
- if ((i & 1) != 0)
- PHP_MD5Update(&ctx, final, 1);
- else
- PHP_MD5Update(&ctx, (const unsigned char *)pw, 1);
-
- /* Now make the output string */
- memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
- strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
- strcat(passwd, "$");
-
- PHP_MD5Final(final, &ctx);
-
- /*
- * And now, just to make sure things don't run too fast. On a 60 MHz
- * Pentium this takes 34 msec, so you would need 30 seconds to build
- * a 1000 entry dictionary...
- */
- for (i = 0; i < 1000; i++) {
- PHP_MD5Init(&ctx1);
-
- if ((i & 1) != 0)
- PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl);
- else
- PHP_MD5Update(&ctx1, final, 16);
-
- if ((i % 3) != 0)
- PHP_MD5Update(&ctx1, (const unsigned char *)sp, sl);
-
- if ((i % 7) != 0)
- PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl);
-
- if ((i & 1) != 0)
- PHP_MD5Update(&ctx1, final, 16);
- else
- PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl);
-
- PHP_MD5Final(final, &ctx1);
- }
-
- p = passwd + sl + MD5_MAGIC_LEN + 1;
-
- l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
- l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
- l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
- l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4;
- l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4;
- l = final[11] ; to64(p,l,2); p += 2;
- *p = '\0';
-
- /* Don't leave anything around in vm they could use. */
- memset(final, 0, sizeof(final));
- return (passwd);
-}
-
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.29.tgz/crypt_md5.h
^
|
| @@ -1,37 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2006 The PHP Group |
- +----------------------------------------------------------------------+
- | 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: Edin Kadribasic |
- +----------------------------------------------------------------------+
- */
-
-/* $Id: crypt_md5.h,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ */
-#ifndef _MD5CRYPT_H_
-#define _MD5CRYPT_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define MD5_MAGIC "$1$"
-#define MD5_MAGIC_LEN 3
-
-char *md5_crypt(const char *pw, const char *salt);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MD5CRYPT_H_ */
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.29.tgz/crypt_win32.c
^
|
| @@ -1,355 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2006 The PHP Group |
- +----------------------------------------------------------------------+
- | 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: |
- +----------------------------------------------------------------------+
- */
-
-/* $Id: crypt_win32.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ */
-
-/* This code is distributed under the PHP license with permission from
- the author Jochen Obalek <jochen.obalek@bigfoot.de> */
-
-/* encrypt.c - providing 56 bit DES encryption
- Copyright (C) 1991 Jochen Obalek
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#include <time.h>
-#include <string.h>
-#include <stdlib.h>
-#include "crypt_md5.h"
-
-#define BS 64
-#define BS2 32
-#define KS 48
-#define KS2 24
-#define IS 56
-#define IS2 28
-
-static char schluessel[16][KS];
-
-
-static char PC1[] =
-{
- 56, 48, 40, 32, 24, 16, 8, 0,
- 57, 49, 41, 33, 25, 17, 9, 1,
- 58, 50, 42, 34, 26, 18, 10, 2,
- 59, 51, 43, 35,
- 62, 54, 46, 38, 30, 22, 14, 6,
- 61, 53, 45, 37, 29, 21, 13, 5,
- 60, 52, 44, 36, 28, 20, 12, 4,
- 27, 19, 11, 3
-};
-
-
-static char PC2[] =
-{
- 13, 16, 10, 23, 0, 4, 2, 27,
- 14, 5, 20, 9, 22, 18, 11, 3,
- 25, 7, 15, 6, 26, 19, 12, 1,
- 40, 51, 30, 36, 46, 54, 29, 39,
- 50, 44, 32, 47, 43, 48, 38, 55,
- 33, 52, 45, 41, 49, 35, 28, 31
-};
-
-
-static char IP[] =
-{
- 57, 49, 41, 33, 25, 17, 9, 1,
- 59, 51, 43, 35, 27, 19, 11, 3,
- 61, 53, 45, 37, 29, 21, 13, 5,
- 63, 55, 47, 39, 31, 23, 15, 7,
- 56, 48, 40, 32, 24, 16, 8, 0,
- 58, 50, 42, 34, 26, 18, 10, 2,
- 60, 52, 44, 36, 28, 20, 12, 4,
- 62, 54, 46, 38, 30, 22, 14, 6
-};
-
-
-static char EP[] =
-{
- 7, 39, 15, 47, 23, 55, 31, 63,
- 6, 38, 14, 46, 22, 54, 30, 62,
- 5, 37, 13, 45, 21, 53, 29, 61,
- 4, 36, 12, 44, 20, 52, 28, 60,
- 3, 35, 11, 43, 19, 51, 27, 59,
- 2, 34, 10, 42, 18, 50, 26, 58,
- 1, 33, 9, 41, 17, 49, 25, 57,
- 0, 32, 8, 40, 16, 48, 24, 56
-};
-
-
-static char E0[] =
-{
- 31, 0, 1, 2, 3, 4, 3, 4,
- 5, 6, 7, 8, 7, 8, 9, 10,
- 11, 12, 11, 12, 13, 14, 15, 16,
- 15, 16, 17, 18, 19, 20, 19, 20,
- 21, 22, 23, 24, 23, 24, 25, 26,
- 27, 28, 27, 28, 29, 30, 31, 0
-};
-
-
-static char E[KS];
-
-
-static char PERM[] =
-{
- 15, 6, 19, 20, 28, 11, 27, 16,
- 0, 14, 22, 25, 4, 17, 30, 9,
- 1, 7, 23, 13, 31, 26, 2, 8,
- 18, 12, 29, 5, 21, 10, 3, 24
-};
-
-
-static char S_BOX[][64] =
-{
- {
- 14, 0, 4, 15, 13, 7, 1, 4, 2, 14, 15, 2, 11, 13, 8, 1,
- 3, 10, 10, 6, 6, 12, 12, 11, 5, 9, 9, 5, 0, 3, 7, 8,
- 4, 15, 1, 12, 14, 8, 8, 2, 13, 4, 6, 9, 2, 1, 11, 7,
- 15, 5, 12, 11, 9, 3, 7, 14, 3, 10, 10, 0, 5, 6, 0, 13
- },
- {
- 15, 3, 1, 13, 8, 4, 14, 7, 6, 15, 11, 2, 3, 8, 4, 14,
- 9, 12, 7, 0, 2, 1, 13, 10, 12, 6, 0, 9, 5, 11, 10, 5,
- 0, 13, 14, 8, 7, 10, 11, 1, 10, 3, 4, 15, 13, 4, 1, 2,
- 5, 11, 8, 6, 12, 7, 6, 12, 9, 0, 3, 5, 2, 14, 15, 9
- },
- {
- 10, 13, 0, 7, 9, 0, 14, 9, 6, 3, 3, 4, 15, 6, 5, 10,
- 1, 2, 13, 8, 12, 5, 7, 14, 11, 12, 4, 11, 2, 15, 8, 1,
- 13, 1, 6, 10, 4, 13, 9, 0, 8, 6, 15, 9, 3, 8, 0, 7,
- 11, 4, 1, 15, 2, 14, 12, 3, 5, 11, 10, 5, 14, 2, 7, 12
- },
- {
- 7, 13, 13, 8, 14, 11, 3, 5, 0, 6, 6, 15, 9, 0, 10, 3,
- 1, 4, 2, 7, 8, 2, 5, 12, 11, 1, 12, 10, 4, 14, 15, 9,
- 10, 3, 6, 15, 9, 0, 0, 6, 12, 10, 11, 1, 7, 13, 13, 8,
- 15, 9, 1, 4, 3, 5, 14, 11, 5, 12, 2, 7, 8, 2, 4, 14
- },
- {
- 2, 14, 12, 11, 4, 2, 1, 12, 7, 4, 10, 7, 11, 13, 6, 1,
- 8, 5, 5, 0, 3, 15, 15, 10, 13, 3, 0, 9, 14, 8, 9, 6,
- 4, 11, 2, 8, 1, 12, 11, 7, 10, 1, 13, 14, 7, 2, 8, 13,
- 15, 6, 9, 15, 12, 0, 5, 9, 6, 10, 3, 4, 0, 5, 14, 3
- },
- {
- 12, 10, 1, 15, 10, 4, 15, 2, 9, 7, 2, 12, 6, 9, 8, 5,
- 0, 6, 13, 1, 3, 13, 4, 14, 14, 0, 7, 11, 5, 3, 11, 8,
- 9, 4, 14, 3, 15, 2, 5, 12, 2, 9, 8, 5, 12, 15, 3, 10,
- 7, 11, 0, 14, 4, 1, 10, 7, 1, 6, 13, 0, 11, 8, 6, 13
- },
- {
- 4, 13, 11, 0, 2, 11, 14, 7, 15, 4, 0, 9, 8, 1, 13, 10,
- 3, 14, 12, 3, 9, 5, 7, 12, 5, 2, 10, 15, 6, 8, 1, 6,
- 1, 6, 4, 11, 11, 13, 13, 8, 12, 1, 3, 4, 7, 10, 14, 7,
- 10, 9, 15, 5, 6, 0, 8, 15, 0, 14, 5, 2, 9, 3, 2, 12
- },
- {
- 13, 1, 2, 15, 8, 13, 4, 8, 6, 10, 15, 3, 11, 7, 1, 4,
- 10, 12, 9, 5, 3, 6, 14, 11, 5, 0, 0, 14, 12, 9, 7, 2,
- 7, 2, 11, 1, 4, 14, 1, 7, 9, 4, 12, 10, 14, 8, 2, 13,
- 0, 15, 6, 12, 10, 9, 13, 0, 15, 3, 3, 5, 5, 6, 8, 11
- }
-};
-
-static void
-perm (a, e, pc, n)
- register char *a, *e;
- register char *pc;
- int n;
-{
- for (; n--; pc++, a++)
- *a = e[*pc];
-}
-
-static void
-crypt_main (nachr_l, nachr_r, schl)
- register char *nachr_l, *nachr_r;
- register char *schl;
-{
- char tmp[KS];
- register int sbval;
- register char *tp = tmp;
- register char *e = E;
- register int i, j;
-
- for (i = 0; i < 8; i++)
- {
- for (j = 0, sbval = 0; j < 6; j++)
- sbval = (sbval << 1) | (nachr_r[*e++] ^ *schl++);
- sbval = S_BOX[i][sbval];
- for (tp += 4, j = 4; j--; sbval >>= 1)
- *--tp = sbval & 1;
- tp += 4;
- }
-
- e = PERM;
- for (i = 0; i < BS2; i++)
- *nachr_l++ ^= tmp[*e++];
-}
-
-void
-encrypt (char *nachr, int decr)
-{
- char (*schl)[KS] = decr ? schluessel + 15 : schluessel;
- char tmp[BS];
- int i;
-
- perm (tmp, nachr, IP, BS);
-
- for (i = 8; i--;)
- {
- crypt_main (tmp, tmp + BS2, *schl);
- if (decr)
- schl--;
- else
- schl++;
- crypt_main (tmp + BS2, tmp, *schl);
- if (decr)
- schl--;
- else
- schl++;
- }
-
- perm (nachr, tmp, EP, BS);
-}
-
-void
-setkey (char *schl)
-{
- char tmp1[IS];
- register unsigned int ls = 0x7efc;
- register int i, j, k;
- register int shval = 0;
- register char *akt_schl;
-
- memcpy (E, E0, KS);
- perm (tmp1, schl, PC1, IS);
-
- for (i = 0; i < 16; i++)
- {
- shval += 1 + (ls & 1);
- akt_schl = schluessel[i];
- for (j = 0; j < KS; j++)
- {
- if ((k = PC2[j]) >= IS2)
- {
- if ((k += shval) >= IS)
- k = (k - IS2) % IS2 + IS2;
- }
- else if ((k += shval) >= IS2)
- k %= IS2;
- *akt_schl++ = tmp1[k];
- }
- ls >>= 1;
- }
-}
-
-char *
-des_crypt (const char *wort, const char *salt)
-{
- static char retkey[14];
- char key[BS + 2];
- char *k;
- int tmp, keybyte;
- int i, j;
-
- memset (key, 0, BS + 2);
-
- for (k = key, i = 0; i < BS; i++)
- {
- if (!(keybyte = *wort++))
- break;
- k += 7;
- for (j = 0; j < 7; j++, i++)
- {
- *--k = keybyte & 1;
- keybyte >>= 1;
- }
- k += 8;
- }
-
- setkey (key);
- memset (key, 0, BS + 2);
-
- for (k = E, i = 0; i < 2; i++)
- {
- retkey[i] = keybyte = *salt++;
- if (keybyte > 'Z')
- keybyte -= 'a' - 'Z' - 1;
- if (keybyte > '9')
- keybyte -= 'A' - '9' - 1;
- keybyte -= '.';
-
- for (j = 0; j < 6; j++, keybyte >>= 1, k++)
- {
- if (!(keybyte & 1))
- continue;
- tmp = *k;
- *k = k[24];
- k[24] = tmp;
- }
- }
-
- for (i = 0; i < 25; i++)
- encrypt (key, 0);
-
- for (k = key, i = 0; i < 11; i++)
- {
- for (j = keybyte = 0; j < 6; j++)
- {
- keybyte <<= 1;
- keybyte |= *k++;
- }
-
- keybyte += '.';
- if (keybyte > '9')
- keybyte += 'A' - '9' - 1;
- if (keybyte > 'Z')
- keybyte += 'a' - 'Z' - 1;
- retkey[i + 2] = keybyte;
- }
-
- retkey[i + 2] = 0;
-
- if (!retkey[1])
- retkey[1] = *retkey;
-
- return retkey;
-}
-
-char *
-crypt (const char *pw, const char *salt)
-{
- if (strlen(salt)>MD5_MAGIC_LEN && strncmp(salt, MD5_MAGIC, MD5_MAGIC_LEN)==0) {
- return md5_crypt(pw, salt);
- } else {
- return des_crypt(pw, salt);
- }
-}
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.29.tgz/crypt_win32.h
^
|
| @@ -1,60 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2006 The PHP Group |
- +----------------------------------------------------------------------+
- | 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: |
- +----------------------------------------------------------------------+
- */
-
-/* $Id: crypt_win32.h,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ */
-
-/* This code is distributed under the PHP license with permission from
- the author Jochen Obalek <jochen.obalek@bigfoot.de> */
-
-/* encrypt.h - API to 56 bit DES encryption via calls
- encrypt(3), setkey(3) and crypt(3)
- Copyright (C) 1991 Jochen Obalek
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#ifndef _ENCRYPT_H_
-#define _ENCRYPT_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <_ansi.h>
-
-void _EXFUN(encrypt, (char *block, int edflag));
-void _EXFUN(setkey, (char *key));
-char * _EXFUN(crypt, (const char *key, const char *salt));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ENCRYPT_H_ */
|
|
|
Deleted |
suhosin-0.9.32.1.tgz
^
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/Changelog
^
|
| @@ -1,3 +1,42 @@
+2012-01-19 - 0.9.33
+
+ - Make clear that suhosin is incompatible to mbstring.encoding_translation=On
+ - Stop mbstring extension from replacing POST handlers
+ - Added detection of extensions manipulating POST handlers
+ - Fixed environment variables for logging do not go through the filter extension anymore
+ - Fixed stack based buffer overflow in transparent cookie encryption (see separate advisory)
+ - Fixed that disabling HTTP response splitting protection also disabled NUL byte protection in HTTP headers
+ - Removed crypt() support - because not used for PHP >= 5.3.0 anyway
+
+2010-07-23 - 0.9.32.1
+
+ - Fixed missing header file resulting in compile errors
+
+2010-07-23 - 0.9.32
+
+ - Added support for memory_limit > 2GB
+ - Fixed missing header file resulting in wrong php_combined_lcg() prototype being used
+ - Improved random number seed generation more by adding /dev/urandom juice
+
+2010-03-28 - 0.9.31
+
+ - Fix ZTS build of session.c
+ - Increased session identifier entropy by using /dev/urandom if available
+
+2010-03-25 - 0.9.30
+
+ - Added line ending characters %0a and %0d to the list of dangerous characters handled
+ by suhosin.server.encode and suhosin.server.strip
+ - Fixed crash bug with PHP 5.3.x and session module (due to changed session globals struct)
+ - Added ! protection to PHP session serializer
+ - Fixed simulation mode now also affects (dis)allowed functions
+ - Fixed missing return (1); in random number generator replacements
+ - Fixed random number generator replacement error case behaviour in PHP 5.3.x
+ - Fixed error case handling in function_exists() PHP 5.3.x
+ - Merged changes/fixes in import_request_variables()/extract() from upstream PHP
+ - Fixed suhosin_header_handler to be PHP 5.3.x compatible
+ - Merge fixes and new features of PHP's file upload code to suhosin
+
2009-08-15 - 0.9.29
- Fixing crash bugs with PHP 5.3.0 caused by unexpected NULL in EG(active_symbol_table)
@@ -14,23 +53,23 @@
2008-08-23 - 0.9.27
- - Fixed typo in replacement rand() / mt_rand() that was hidden by LAZY symbol loading
+ - Fixed typo in replacement rand() / mt_rand() that was hidden by LAZY symbol loading
2008-08-22 - 0.9.26
- - Fixed problem with suhosin.perdir
- Thanks to Hosteurope for tracking this down
- - Fixed problems with ext/uploadprogress
- Reported by: Christian Stocker
- - Added suhosin.srand.ignore and suhosin.mt_srand.ignore (default: on)
- - Modified rand()/srand() to use the Mersenne Twister algorithm with separate state
- - Added better internal seeding of rand() and mt_rand()
-
+ - Fixed problem with suhosin.perdir
+ Thanks to Hosteurope for tracking this down
+ - Fixed problems with ext/uploadprogress
+ Reported by: Christian Stocker
+ - Added suhosin.srand.ignore and suhosin.mt_srand.ignore (default: on)
+ - Modified rand()/srand() to use the Mersenne Twister algorithm with separate state
+ - Added better internal seeding of rand() and mt_rand()
+
2008-08-06 - 0.9.25
- - Fixed PHP 4 compilation problem introduced in 0.9.24
- - Fixed PHP 5.3 compilation problem
- - Changed PHP default POST handler to PHP's current handler
+ - Fixed PHP 4 compilation problem introduced in 0.9.24
+ - Fixed PHP 5.3 compilation problem
+ - Changed PHP default POST handler to PHP's current handler
2008-05-10 - 0.9.24
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/config.m4
^
|
| @@ -5,5 +5,5 @@
[ --enable-suhosin Enable suhosin support])
if test "$PHP_SUHOSIN" != "no"; then
- PHP_NEW_EXTENSION(suhosin, suhosin.c crypt.c crypt_blowfish.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c log.c header.c execute.c ex_imp.c session.c aes.c compat_snprintf.c, $ext_shared)
+ PHP_NEW_EXTENSION(suhosin, suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c log.c header.c execute.c ex_imp.c session.c aes.c compat_snprintf.c, $ext_shared)
fi
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/config.w32
^
|
| @@ -4,8 +4,5 @@
ARG_ENABLE("suhosin", "whether to enable suhosin support", "yes");
if (PHP_SUHOSIN == "yes") {
- EXTENSION("suhosin", "suhosin.c crypt.c crypt_blowfish.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c log.c header.c execute.c ex_imp.c session.c aes.c");
- if (PHP_SUHOSIN_SHARED) {
- ADD_SOURCES(configure_module_dirname, "crypt_win32.c crypt_md5.c", "suhosin");
- }
+ EXTENSION("suhosin", "suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c log.c header.c execute.c ex_imp.c session.c aes.c");
}
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/ex_imp.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -28,6 +28,7 @@
#include "php_ini.h"
#include "php_suhosin.h"
#include "ext/standard/php_smart_str.h"
+#include "ext/standard/php_var.h"
#define EXTR_OVERWRITE 0
@@ -41,21 +42,33 @@
#define EXTR_REFS 0x100
-static int php_valid_var_name(char *var_name)
+static int php_valid_var_name(char *var_name, int len) /* {{{ */
{
- int len, i;
+ int i, ch;
if (!var_name)
return 0;
-
- len = strlen(var_name);
-
- if (!isalpha((int)((unsigned char *)var_name)[0]) && var_name[0] != '_')
+
+ /* These are allowed as first char: [a-zA-Z_\x7f-\xff] */
+ ch = (int)((unsigned char *)var_name)[0];
+ if (var_name[0] != '_' &&
+ (ch < 65 /* A */ || /* Z */ ch > 90) &&
+ (ch < 97 /* a */ || /* z */ ch > 122) &&
+ (ch < 127 /* 0x7f */ || /* 0xff */ ch > 255)
+ ) {
return 0;
-
+ }
+
+ /* And these as the rest: [a-zA-Z0-9_\x7f-\xff] */
if (len > 1) {
- for (i=1; i<len; i++) {
- if (!isalnum((int)((unsigned char *)var_name)[i]) && var_name[i] != '_') {
+ for (i = 1; i < len; i++) {
+ ch = (int)((unsigned char *)var_name)[i];
+ if (var_name[i] != '_' &&
+ (ch < 48 /* 0 */ || /* 9 */ ch > 57) &&
+ (ch < 65 /* A */ || /* Z */ ch > 90) &&
+ (ch < 97 /* a */ || /* z */ ch > 122) &&
+ (ch < 127 /* 0x7f */ || /* 0xff */ ch > 255)
+ ) {
return 0;
}
}
@@ -95,7 +108,162 @@
Imports variables into symbol table from an array */
PHP_FUNCTION(suhosin_extract)
{
- zval **var_array, **z_extract_type, **prefix;
+#if PHP_VERSION_ID >= 50300
+ zval *var_array, *prefix = NULL;
+ long extract_type = EXTR_OVERWRITE;
+ zval **entry, *data;
+ char *var_name;
+ ulong num_key;
+ uint var_name_len;
+ int var_exists, key_type, count = 0;
+ int extract_refs = 0;
+ HashPosition pos;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|lz/", &var_array, &extract_type, &prefix) == FAILURE) {
+ return;
+ }
+
+ extract_refs = (extract_type & EXTR_REFS);
+ extract_type &= 0xff;
+
+ if (extract_type < EXTR_OVERWRITE || extract_type > EXTR_IF_EXISTS) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid extract type");
+ return;
+ }
+
+ if (extract_type > EXTR_SKIP && extract_type <= EXTR_PREFIX_IF_EXISTS && ZEND_NUM_ARGS() < 3) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "specified extract type requires the prefix parameter");
+ return;
+ }
+
+ if (prefix) {
+ convert_to_string(prefix);
+ if (Z_STRLEN_P(prefix) && !php_valid_var_name(Z_STRVAL_P(prefix), Z_STRLEN_P(prefix))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "prefix is not a valid identifier");
+ return;
+ }
+ }
+
+ if (!EG(active_symbol_table)) {
+ zend_rebuild_symbol_table(TSRMLS_C);
+ }
+
+ /* var_array is passed by ref for the needs of EXTR_REFS (needs to
+ * work on the original array to create refs to its members)
+ * simulate pass_by_value if EXTR_REFS is not used */
+ if (!extract_refs) {
+ SEPARATE_ARG_IF_REF(var_array);
+ }
+
+ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(var_array), &pos);
+ while (zend_hash_get_current_data_ex(Z_ARRVAL_P(var_array), (void **)&entry, &pos) == SUCCESS) {
+ zval final_name;
+
+ ZVAL_NULL(&final_name);
+
+ key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(var_array), &var_name, &var_name_len, &num_key, 0, &pos);
+ var_exists = 0;
+
+ if (key_type == HASH_KEY_IS_STRING) {
+ var_name_len--;
+ var_exists = zend_hash_exists(EG(active_symbol_table), var_name, var_name_len + 1);
+ } else if (key_type == HASH_KEY_IS_LONG && (extract_type == EXTR_PREFIX_ALL || extract_type == EXTR_PREFIX_INVALID)) {
+ zval num;
+
+ ZVAL_LONG(&num, num_key);
+ convert_to_string(&num);
+ php_prefix_varname(&final_name, prefix, Z_STRVAL(num), Z_STRLEN(num), 1 TSRMLS_CC);
+ zval_dtor(&num);
+ } else {
+ zend_hash_move_forward_ex(Z_ARRVAL_P(var_array), &pos);
+ continue;
+ }
+
+ switch (extract_type) {
+ case EXTR_IF_EXISTS:
+ if (!var_exists) break;
+ /* break omitted intentionally */
+
+ case EXTR_OVERWRITE:
+ /* GLOBALS protection */
+ if (var_exists && var_name_len == sizeof("GLOBALS") && !strcmp(var_name, "GLOBALS")) {
+ break;
+ }
+ if (var_exists && var_name_len == sizeof("this") && !strcmp(var_name, "this") && EG(scope) && EG(scope)->name_length != 0) {
+ break;
+ }
+ ZVAL_STRINGL(&final_name, var_name, var_name_len, 1);
+ break;
+
+ case EXTR_PREFIX_IF_EXISTS:
+ if (var_exists) {
+ php_prefix_varname(&final_name, prefix, var_name, var_name_len, 1 TSRMLS_CC);
+ }
+ break;
+
+ case EXTR_PREFIX_SAME:
+ if (!var_exists && var_name_len != 0) {
+ ZVAL_STRINGL(&final_name, var_name, var_name_len, 1);
+ }
+ /* break omitted intentionally */
+
+ case EXTR_PREFIX_ALL:
+ if (Z_TYPE(final_name) == IS_NULL && var_name_len != 0) {
+ php_prefix_varname(&final_name, prefix, var_name, var_name_len, 1 TSRMLS_CC);
+ }
+ break;
+
+ case EXTR_PREFIX_INVALID:
+ if (Z_TYPE(final_name) == IS_NULL) {
+ if (!php_valid_var_name(var_name, var_name_len)) {
+ php_prefix_varname(&final_name, prefix, var_name, var_name_len, 1 TSRMLS_CC);
+ } else {
+ ZVAL_STRINGL(&final_name, var_name, var_name_len, 1);
+ }
+ }
+ break;
+
+ default:
+ if (!var_exists) {
+ ZVAL_STRINGL(&final_name, var_name, var_name_len, 1);
+ }
+ break;
+ }
+
+ if (Z_TYPE(final_name) != IS_NULL && php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
+ if (extract_refs) {
+ zval **orig_var;
+
+ SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
+ zval_add_ref(entry);
+
+ if (zend_hash_find(EG(active_symbol_table), Z_STRVAL(final_name), Z_STRLEN(final_name) + 1, (void **) &orig_var) == SUCCESS) {
+ zval_ptr_dtor(orig_var);
+ *orig_var = *entry;
+ } else {
+ zend_hash_update(EG(active_symbol_table), Z_STRVAL(final_name), Z_STRLEN(final_name) + 1, (void **) entry, sizeof(zval *), NULL);
+ }
+ } else {
+ MAKE_STD_ZVAL(data);
+ *data = **entry;
+ zval_copy_ctor(data);
+
+ ZEND_SET_SYMBOL_WITH_LENGTH(EG(active_symbol_table), Z_STRVAL(final_name), Z_STRLEN(final_name) + 1, data, 1, 0);
+ }
+ count++;
+ }
+ zval_dtor(&final_name);
+
+ zend_hash_move_forward_ex(Z_ARRVAL_P(var_array), &pos);
+ }
+
+ if (!extract_refs) {
+ zval_ptr_dtor(&var_array);
+ }
+
+ RETURN_LONG(count);
+#else
+ zval **var_array, *orig_var_array, **z_extract_type, **prefix;
zval **entry, *data;
char *var_name;
smart_str final_name = {0};
@@ -143,12 +311,6 @@
break;
}
-#if PHP_VERSION_ID >= 50300
- if (!EG(active_symbol_table)) {
- zend_rebuild_symbol_table(TSRMLS_C);
- }
-#endif
-
if (extract_type < EXTR_OVERWRITE || extract_type > EXTR_IF_EXISTS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown extract type");
return;
@@ -158,7 +320,15 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argument should be an array");
return;
}
-
+
+ /* var_array is passed by ref for the needs of EXTR_REFS (needs to
+ * work on the original array to create refs to its members)
+ * simulate pass_by_value if EXTR_REFS is not used */
+ if (!extract_refs) {
+ orig_var_array = *var_array;
+ SEPARATE_ARG_IF_REF((*var_array));
+ }
+
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(var_array), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_PP(var_array), (void **)&entry, &pos) == SUCCESS) {
key_type = zend_hash_get_current_key_ex(Z_ARRVAL_PP(var_array), &var_name, &var_name_len, &num_key, 0, &pos);
@@ -183,7 +353,10 @@
case EXTR_OVERWRITE:
/* GLOBALS protection */
- if (var_exists && !strcmp(var_name, "GLOBALS")) {
+ if (var_exists && var_name_len == sizeof("GLOBALS") && !strcmp(var_name, "GLOBALS")) {
+ break;
+ }
+ if (var_exists && var_name_len == sizeof("this") && !strcmp(var_name, "this") && EG(scope) && EG(scope)->name_length != 0) {
break;
}
smart_str_appendl(&final_name, var_name, var_name_len);
@@ -212,7 +385,7 @@
case EXTR_PREFIX_INVALID:
if (final_name.len == 0) {
- if (!php_valid_var_name(var_name)) {
+ if (!php_valid_var_name(var_name, var_name_len)) {
smart_str_appendl(&final_name, Z_STRVAL_PP(prefix), Z_STRLEN_PP(prefix));
smart_str_appendc(&final_name, '_');
smart_str_appendl(&final_name, var_name, var_name_len);
@@ -229,24 +402,17 @@
if (final_name.len) {
smart_str_0(&final_name);
- if (php_valid_var_name(final_name.c)) {
+ if (php_valid_var_name(final_name.c, final_name.len)) {
if (extract_refs) {
zval **orig_var;
+ SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
+ zval_add_ref(entry);
+
if (zend_hash_find(EG(active_symbol_table), final_name.c, final_name.len+1, (void **) &orig_var) == SUCCESS) {
- SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
- zval_add_ref(entry);
-
zval_ptr_dtor(orig_var);
-
*orig_var = *entry;
} else {
- if (Z_REFCOUNT_PP(var_array) > 1) {
- SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
- } else {
- Z_SET_ISREF_PP(entry);
- }
- zval_add_ref(entry);
zend_hash_update(EG(active_symbol_table), final_name.c, final_name.len+1, (void **) entry, sizeof(zval *), NULL);
}
} else {
@@ -265,13 +431,89 @@
zend_hash_move_forward_ex(Z_ARRVAL_PP(var_array), &pos);
}
+ if (!extract_refs) {
+ zval_ptr_dtor(var_array);
+ *var_array = orig_var_array;
+ }
smart_str_free(&final_name);
RETURN_LONG(count);
+#endif
}
/* }}} */
+#if PHP_VERSION_ID >= 50300
+static int copy_request_variable(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
+{
+ zval *prefix, new_key;
+ int prefix_len;
+ zval **var = (zval **) pDest;
+
+ if (num_args != 1) {
+ return 0;
+ }
+
+ prefix = va_arg(args, zval *);
+ prefix_len = Z_STRLEN_P(prefix);
+
+ if (!prefix_len && !hash_key->nKeyLength) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key detected - possible security hazard");
+ return 0;
+ }
+
+ if (hash_key->nKeyLength) {
+ php_prefix_varname(&new_key, prefix, hash_key->arKey, hash_key->nKeyLength - 1, 0 TSRMLS_CC);
+ } else {
+ zval num;
+
+ ZVAL_LONG(&num, hash_key->h);
+ convert_to_string(&num);
+ php_prefix_varname(&new_key, prefix, Z_STRVAL(num), Z_STRLEN(num), 0 TSRMLS_CC);
+ zval_dtor(&num);
+ }
+
+ if (php_varname_check(Z_STRVAL(new_key), Z_STRLEN(new_key), 0 TSRMLS_CC) == FAILURE) {
+ zval_dtor(&new_key);
+ return 0;
+ }
+
+ if (Z_STRVAL(new_key)[0] == 'H') {
+ if ((strcmp(Z_STRVAL(new_key), "HTTP_GET_VARS")==0)||
+ (strcmp(Z_STRVAL(new_key), "HTTP_POST_VARS")==0)||
+ (strcmp(Z_STRVAL(new_key), "HTTP_POST_FILES")==0)||
+ (strcmp(Z_STRVAL(new_key), "HTTP_ENV_VARS")==0)||
+ (strcmp(Z_STRVAL(new_key), "HTTP_SERVER_VARS")==0)||
+ (strcmp(Z_STRVAL(new_key), "HTTP_SESSION_VARS")==0)||
+ (strcmp(Z_STRVAL(new_key), "HTTP_COOKIE_VARS")==0)||
+ (strcmp(Z_STRVAL(new_key), "HTTP_RAW_POST_DATA")==0)) {
+ zval_dtor(&new_key);
+ return 0;
+ }
+ } else if (Z_STRVAL(new_key)[0] == '_') {
+ if ((strcmp(Z_STRVAL(new_key), "_COOKIE")==0)||
+ (strcmp(Z_STRVAL(new_key), "_ENV")==0)||
+ (strcmp(Z_STRVAL(new_key), "_FILES")==0)||
+ (strcmp(Z_STRVAL(new_key), "_GET")==0)||
+ (strcmp(Z_STRVAL(new_key), "_POST")==0)||
+ (strcmp(Z_STRVAL(new_key), "_REQUEST")==0)||
+ (strcmp(Z_STRVAL(new_key), "_SESSION")==0)||
+ (strcmp(Z_STRVAL(new_key), "_SERVER")==0)) {
+ zval_dtor(&new_key);
+ return 0;
+ }
+ } else if (strcmp(Z_STRVAL(new_key), "GLOBALS")==0) {
+ zval_dtor(&new_key);
+ return 0;
+ }
+
+ zend_delete_global_variable(Z_STRVAL(new_key), Z_STRLEN(new_key) TSRMLS_CC);
+ ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), Z_STRVAL(new_key), Z_STRLEN(new_key) + 1, *var, Z_REFCOUNT_PP(var) + 1, 0);
+
+ zval_dtor(&new_key);
+ return 0;
+}
+#else
static int copy_request_variable(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
{
char *prefix, *new_key;
@@ -304,6 +546,12 @@
memcpy(new_key+prefix_len, hash_key->arKey, hash_key->nKeyLength);
} else {
new_key_len = spprintf(&new_key, 0, "%s%ld", prefix, hash_key->h);
+ new_key_len++;
+ }
+
+ if (php_varname_check(new_key, new_key_len-1, 0 TSRMLS_CC) == FAILURE) {
+ zval_dtor(&new_key);
+ return 0;
}
if (new_key[0] == 'H') {
@@ -345,15 +593,68 @@
efree(new_key);
return 0;
}
+#endif
/* {{{ proto bool import_request_variables(string types [, string prefix])
Import GET/POST/Cookie variables into the global scope */
PHP_FUNCTION(suhosin_import_request_variables)
{
+#if PHP_VERSION_ID >= 50300
+ char *types;
+ int types_len;
+ zval *prefix = NULL;
+ char *p;
+ zend_bool ok = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/", &types, &types_len, &prefix) == FAILURE) {
+ return;
+ }
+
+ if (ZEND_NUM_ARGS() > 1) {
+ convert_to_string(prefix);
+
+ if (Z_STRLEN_P(prefix) == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "No prefix specified - possible security hazard");
+ }
+ } else {
+ MAKE_STD_ZVAL(prefix);
+ ZVAL_EMPTY_STRING(prefix);
+ }
+
+ for (p = types; p && *p; p++) {
+ switch (*p) {
+
+ case 'g':
+ case 'G':
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+ ok = 1;
+ break;
+
+ case 'p':
+ case 'P':
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+ ok = 1;
+ break;
+
+ case 'c':
+ case 'C':
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+ ok = 1;
+ break;
+ }
+ }
+
+ if (ZEND_NUM_ARGS() < 2) {
+ zval_ptr_dtor(&prefix);
+ }
+ RETURN_BOOL(ok);
+#else
zval **z_types, **z_prefix;
char *types, *prefix;
uint prefix_len;
char *p;
+ zend_bool ok = 0;
switch (ZEND_NUM_ARGS()) {
@@ -391,29 +692,44 @@
case 'g':
case 'G':
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]), (apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);
+ ok = 1;
break;
case 'p':
case 'P':
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]), (apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES]), (apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);
+ ok = 1;
break;
case 'c':
case 'C':
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]), (apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);
+ ok = 1;
break;
}
}
+ RETURN_BOOL(ok);
+#endif
}
/* }}} */
+ZEND_BEGIN_ARG_INFO_EX(suhosin_arginfo_extract, 0, 0, 1)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arg) /* ARRAY_INFO(0, arg, 0) */
+ ZEND_ARG_INFO(0, extract_type)
+ ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(suhosin_arginfo_import_request_variables, 0, 0, 1)
+ ZEND_ARG_INFO(0, types)
+ ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO()
/* {{{ suhosin_ex_imp_functions[]
*/
function_entry suhosin_ex_imp_functions[] = {
- PHP_NAMED_FE(extract, PHP_FN(suhosin_extract), NULL)
- PHP_NAMED_FE(import_request_variables, PHP_FN(suhosin_import_request_variables), NULL)
+ PHP_NAMED_FE(extract, PHP_FN(suhosin_extract), suhosin_arginfo_extract)
+ PHP_NAMED_FE(import_request_variables, PHP_FN(suhosin_import_request_variables), suhosin_arginfo_import_request_variables)
{NULL, NULL, NULL}
};
/* }}} */
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/execute.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -23,12 +23,14 @@
#include "config.h"
#endif
+#include <fcntl.h>
#include "php.h"
#include "php_ini.h"
#include "zend_hash.h"
#include "zend_extensions.h"
#include "ext/standard/info.h"
#include "ext/standard/php_rand.h"
+#include "ext/standard/php_lcg.h"
#include "php_suhosin.h"
#include "zend_compile.h"
#include "zend_llist.h"
@@ -1067,19 +1069,34 @@
static int ih_function_exists(IH_HANDLER_PARAMS)
{
+#ifndef PHP_ATLEAST_5_3
zval **function_name;
+#endif
zend_function *func;
char *lcname;
zend_bool retval;
int func_name_len;
+#ifndef PHP_ATLEAST_5_3
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+ ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(1);
}
convert_to_string_ex(function_name);
func_name_len = Z_STRLEN_PP(function_name);
- lcname = estrndup(Z_STRVAL_PP(function_name), func_name_len);
+ lcname = estrndup(Z_STRVAL_PP(function_name), func_name_len);
zend_str_tolower(lcname, func_name_len);
+#else
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &lcname, &func_name_len) == FAILURE) {
+ return;
+ }
+
+ /* Ignore leading "\" */
+ if (lcname[0] == '\\') {
+ lcname = &lcname[1];
+ func_name_len--;
+ }
+ lcname = zend_str_tolower_dup(lcname, func_name_len);
+#endif
retval = (zend_hash_find(EG(function_table), lcname, func_name_len+1, (void **)&func) == SUCCESS);
@@ -1299,6 +1316,7 @@
unsigned long stack_value = (unsigned long)&code_value;
unsigned long heap_value = (unsigned long)SUHOSIN_G(r_state);
suhosin_SHA256_CTX context;
+ int fd;
code_value ^= code_value >> 32;
stack_value ^= stack_value >> 32;
@@ -1314,9 +1332,18 @@
seedbuf[4] = getpid();
#endif
seedbuf[5] = (php_uint32) 0x7fffffff * php_combined_lcg(TSRMLS_C);
-
+
+#ifndef PHP_WIN32
+ fd = VCWD_OPEN("/dev/urandom", O_RDONLY);
+ if (fd >= 0) {
+ /* ignore error case - if urandom doesn't give us any/enough random bytes */
+ read(fd, &seedbuf[6], 2 * sizeof(php_uint32));
+ close(fd);
+ }
+#endif
+
suhosin_SHA256Init(&context);
- suhosin_SHA256Update(&context, (void *) seedbuf, sizeof(php_uint32) * 6);
+ suhosin_SHA256Update(&context, (void *) seedbuf, sizeof(php_uint32) * 8);
suhosin_SHA256Final(seedbuf, &context);
}
/* }}} */
@@ -1394,7 +1421,6 @@
long seed;
if (zend_parse_parameters(argc TSRMLS_CC, "|l", &seed) == FAILURE || SUHOSIN_G(srand_ignore)) {
- RETVAL_FALSE;
return (1);
}
@@ -1403,7 +1429,6 @@
} else {
suhosin_srand(seed TSRMLS_CC);
}
- RETVAL_TRUE;
return (1);
}
@@ -1413,7 +1438,6 @@
long seed;
if (zend_parse_parameters(argc TSRMLS_CC, "|l", &seed) == FAILURE || SUHOSIN_G(mt_srand_ignore)) {
- RETVAL_FALSE;
return (1);
}
@@ -1422,7 +1446,6 @@
} else {
suhosin_mt_srand(seed TSRMLS_CC);
}
- RETVAL_TRUE;
return (1);
}
@@ -1446,7 +1469,8 @@
RAND_RANGE(number, min, max, PHP_MT_RAND_MAX);
}
- RETURN_LONG(number);
+ RETVAL_LONG(number);
+ return (1);
}
static int ih_rand(IH_HANDLER_PARAMS)
@@ -1469,17 +1493,23 @@
RAND_RANGE(number, min, max, PHP_MT_RAND_MAX);
}
- RETURN_LONG(number);
+ RETVAL_LONG(number);
+ return (1);
}
static int ih_getrandmax(IH_HANDLER_PARAMS)
{
- int argc = ZEND_NUM_ARGS();
+#ifdef PHP_ATLEAST_5_3
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+#else
+ int argc = ZEND_NUM_ARGS();
- if (argc != 0) {
- ZEND_WRONG_PARAM_COUNT();
- }
-
+ if (argc != 0) {
+ ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(1);
+ }
+#endif
RETVAL_LONG(PHP_MT_RAND_MAX);
return (1);
}
@@ -1543,6 +1573,7 @@
};
#define FUNCTION_WARNING() zend_error(E_WARNING, "%s() has been disabled for security reasons", get_active_function_name(TSRMLS_C));
+#define FUNCTION_SIMULATE_WARNING() zend_error(E_WARNING, "SIMULATION - %s() has been disabled for security reasons", get_active_function_name(TSRMLS_C));
/* {{{ void suhosin_execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC)
* This function provides a hook for internal execution */
@@ -1577,7 +1608,7 @@
#ifdef ZEND_ENGINE_2
return_value = (*(temp_variable *)((char *) execute_data_ptr->Ts + execute_data_ptr->opline->result.u.var)).var.ptr;
#else
- return_value = execute_data_ptr->Ts[execute_data_ptr->opline->result.u.var].var.ptr;
+ return_value = execute_data_ptr->Ts[execute_data_ptr->opline->result.u.var].var.ptr;
#endif
ht = execute_data_ptr->opline->extended_value;
@@ -1588,12 +1619,20 @@
if (SUHOSIN_G(eval_whitelist) != NULL) {
if (!zend_hash_exists(SUHOSIN_G(eval_whitelist), lcname, function_name_strlen+1)) {
suhosin_log(S_EXECUTOR, "function outside of eval whitelist called: %s()", lcname);
- goto execute_internal_bailout;
+ if (!SUHOSIN_G(simulation)) {
+ goto execute_internal_bailout;
+ } else {
+ FUNCTION_SIMULATE_WARNING()
+ }
}
} else if (SUHOSIN_G(eval_blacklist) != NULL) {
if (zend_hash_exists(SUHOSIN_G(eval_blacklist), lcname, function_name_strlen+1)) {
suhosin_log(S_EXECUTOR, "function within eval blacklist called: %s()", lcname);
- goto execute_internal_bailout;
+ if (!SUHOSIN_G(simulation)) {
+ goto execute_internal_bailout;
+ } else {
+ FUNCTION_SIMULATE_WARNING()
+ }
}
}
}
@@ -1601,12 +1640,20 @@
if (SUHOSIN_G(func_whitelist) != NULL) {
if (!zend_hash_exists(SUHOSIN_G(func_whitelist), lcname, function_name_strlen+1)) {
suhosin_log(S_EXECUTOR, "function outside of whitelist called: %s()", lcname);
- goto execute_internal_bailout;
+ if (!SUHOSIN_G(simulation)) {
+ goto execute_internal_bailout;
+ } else {
+ FUNCTION_SIMULATE_WARNING()
+ }
}
} else if (SUHOSIN_G(func_blacklist) != NULL) {
if (zend_hash_exists(SUHOSIN_G(func_blacklist), lcname, function_name_strlen+1)) {
suhosin_log(S_EXECUTOR, "function within blacklist called: %s()", lcname);
- goto execute_internal_bailout;
+ if (!SUHOSIN_G(simulation)) {
+ goto execute_internal_bailout;
+ } else {
+ FUNCTION_SIMULATE_WARNING()
+ }
}
}
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/ifilter.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -118,7 +118,7 @@
static unsigned char suhosin_hexchars[] = "0123456789ABCDEF";
static const char suhosin_is_dangerous_char[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0,
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/log.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -118,12 +118,12 @@
}
if (SUHOSIN_G(log_use_x_forwarded_for)) {
- ip_address = sapi_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
+ ip_address = suhosin_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
if (ip_address == NULL) {
ip_address = "X-FORWARDED-FOR not set";
}
} else {
- ip_address = sapi_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
+ ip_address = suhosin_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
if (ip_address == NULL) {
ip_address = "REMOTE_ADDR not set";
}
@@ -154,7 +154,7 @@
}
ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno);
} else {
- fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
+ fname = suhosin_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
if (fname==NULL) {
fname = "unknown";
}
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/mbregex.h
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/memory_limit.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -47,12 +47,20 @@
SUHOSIN_G(hard_memory_limit) = 0;
}
if (new_value) {
- PG(memory_limit) = zend_atoi(new_value, new_value_length);
- if (PG(memory_limit) > hard_memory_limit || PG(memory_limit) < 0) {
- suhosin_log(S_MISC, "script tried to increase memory_limit to %u bytes which is above the allowed value", PG(memory_limit));
- if (!SUHOSIN_G(simulation)) {
- PG(memory_limit) = hard_memory_limit;
- return FAILURE;
+ PG(memory_limit) = zend_atol(new_value, new_value_length);
+ if (hard_memory_limit > 0) {
+ if (PG(memory_limit) > hard_memory_limit) {
+ suhosin_log(S_MISC, "script tried to increase memory_limit to %u bytes which is above the allowed value", PG(memory_limit));
+ if (!SUHOSIN_G(simulation)) {
+ PG(memory_limit) = hard_memory_limit;
+ return FAILURE;
+ }
+ } else if (PG(memory_limit) < 0) {
+ suhosin_log(S_MISC, "script tried to disable memory_limit by setting it to a negative value %d bytes which is not allowed", PG(memory_limit));
+ if (!SUHOSIN_G(simulation)) {
+ PG(memory_limit) = hard_memory_limit;
+ return FAILURE;
+ }
}
}
} else {
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/php_suhosin.h
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -22,7 +22,7 @@
#ifndef PHP_SUHOSIN_H
#define PHP_SUHOSIN_H
-#define SUHOSIN_EXT_VERSION "0.9.29"
+#define SUHOSIN_EXT_VERSION "0.9.33"
/*#define SUHOSIN_DEBUG*/
#define SUHOSIN_LOG "/tmp/suhosin_log.txt"
@@ -306,13 +306,14 @@
char *suhosin_decrypt_string(char *str, int padded_len, char *var, int vlen, char *key, int *orig_len, int check_ra TSRMLS_DC);
char *suhosin_generate_key(char *key, zend_bool ua, zend_bool dr, long raddr, char *cryptkey TSRMLS_DC);
char *suhosin_cookie_decryptor(TSRMLS_D);
+char *suhosin_getenv(char *name, size_t name_len TSRMLS_DC);
void suhosin_hook_post_handlers(TSRMLS_D);
+void suhosin_unhook_post_handlers();
void suhosin_hook_register_server_variables();
void suhosin_hook_header_handler();
void suhosin_unhook_header_handler();
void suhosin_hook_session(TSRMLS_D);
void suhosin_unhook_session(TSRMLS_D);
-void suhosin_hook_crypt();
void suhosin_hook_sha256();
void suhosin_hook_ex_imp();
void suhosin_hook_treat_data();
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/post_handler.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -79,6 +79,48 @@
}
}
+static void suhosin_post_handler_modification(sapi_post_entry *spe)
+{
+ char *content_type = estrndup(spe->content_type, spe->content_type_len);
+ suhosin_log(S_VARS, "some extension replaces the POST handler for %s - Suhosin's protection will be incomplete", content_type);
+ efree(content_type);
+}
+
+static int (*old_OnUpdate_mbstring_encoding_translation)(zend_ini_entry *entry, char *new_value, uint new_value_length, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage TSRMLS_DC) = NULL;
+
+/* {{{ static PHP_INI_MH(suhosin_OnUpdate_mbstring_encoding_translation) */
+static PHP_INI_MH(suhosin_OnUpdate_mbstring_encoding_translation)
+{
+ zend_bool *p;
+#ifndef ZTS
+ char *base = (char *) mh_arg2;
+#else
+ char *base;
+
+ base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+ p = (zend_bool *) (base+(size_t) mh_arg1);
+
+ if (new_value_length == 2 && strcasecmp("on", new_value) == 0) {
+ *p = (zend_bool) 1;
+ }
+ else if (new_value_length == 3 && strcasecmp("yes", new_value) == 0) {
+ *p = (zend_bool) 1;
+ }
+ else if (new_value_length == 4 && strcasecmp("true", new_value) == 0) {
+ *p = (zend_bool) 1;
+ }
+ else {
+ *p = (zend_bool) atoi(new_value);
+ }
+ if (*p) {
+ suhosin_log(S_VARS, "Dynamic configuration (maybe a .htaccess file) tried to activate mbstring.encoding_translation which is incompatible with suhosin");
+ }
+ return SUCCESS;
+}
+/* }}} */
+
/* {{{ php_post_entries[]
*/
static sapi_post_entry suhosin_post_entries[] = {
@@ -90,6 +132,9 @@
void suhosin_hook_post_handlers(TSRMLS_D)
{
+ HashTable tempht;
+ zend_ini_entry *ini_entry;
+
#if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0)
sapi_unregister_post_entry(&suhosin_post_entries[0] TSRMLS_CC);
sapi_unregister_post_entry(&suhosin_post_entries[1] TSRMLS_CC);
@@ -99,8 +144,39 @@
sapi_unregister_post_entry(&suhosin_post_entries[1]);
sapi_register_post_entries(suhosin_post_entries);
#endif
+ /* we want to get notified if another extension deregisters the suhosin post handlers */
+
+ /* we need to tell suhosin patch that there is a new valid destructor */
+ /* therefore we have create HashTable that has this destructor */
+ zend_hash_init(&tempht, 0, NULL, suhosin_post_handler_modification, 0);
+ zend_hash_destroy(&tempht);
+ /* And now we can overwrite the destructor for post entries */
+ SG(known_post_content_types).pDestructor = suhosin_post_handler_modification;
+
+ /* we have to stop mbstring from replacing our post handler */
+ if (zend_hash_find(EG(ini_directives), "mbstring.encoding_translation", sizeof("mbstring.encoding_translation"), (void **) &ini_entry) == FAILURE) {
+ return;
+ }
+ /* replace OnUpdate_mbstring_encoding_translation handler */
+ old_OnUpdate_mbstring_encoding_translation = ini_entry->on_modify;
+ ini_entry->on_modify = suhosin_OnUpdate_mbstring_encoding_translation;
}
+void suhosin_unhook_post_handlers()
+{
+ zend_ini_entry *ini_entry;
+
+ /* Restore to an empty destructor */
+ SG(known_post_content_types).pDestructor = NULL;
+
+ /* Now restore the ini entry handler */
+ if (zend_hash_find(EG(ini_directives), "mbstring.encoding_translation", sizeof("mbstring.encoding_translation"), (void **) &ini_entry) == FAILURE) {
+ return;
+ }
+ /* replace OnUpdate_mbstring_encoding_translation handler */
+ ini_entry->on_modify = old_OnUpdate_mbstring_encoding_translation;
+ old_OnUpdate_mbstring_encoding_translation = NULL;
+}
/*
* Local variables:
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/rfc1867.c
^
|
| @@ -33,6 +33,8 @@
#include "php_variables.h"
#include "php_suhosin.h"
#include "suhosin_rfc1867.h"
+#include "php_ini.h"
+#include "ext/standard/php_string.h"
#define DEBUG_FILE_UPLOAD ZEND_DEBUG
@@ -776,13 +778,15 @@
int str_len = 0, num_vars = 0, num_vars_max = 2*10, *len_list = NULL;
char **val_list = NULL;
#endif
- zend_bool magic_quotes_gpc;
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
int fd=-1;
zend_llist header;
void *event_extra_data = NULL;
-
+#if PHP_VERSION_ID >= 50302 || (PHP_VERSION_ID >= 50212 && PHP_VERSION_ID < 50300)
+ int upload_cnt = INI_INT("max_file_uploads");
+#endif
+
SDEBUG("suhosin_rfc1867_handler");
if (SG(request_info).content_length > SG(post_max_size)) {
@@ -792,6 +796,18 @@
/* Get the boundary */
boundary = strstr(content_type_dup, "boundary");
+ if (!boundary) {
+ int content_type_len = strlen(content_type_dup);
+ char *content_type_lcase = estrndup(content_type_dup, content_type_len);
+
+ php_strtolower(content_type_lcase, content_type_len);
+ boundary = strstr(content_type_lcase, "boundary");
+ if (boundary) {
+ boundary = content_type_dup + (boundary - content_type_lcase);
+ }
+ efree(content_type_lcase);
+ }
+
if (!boundary || !(boundary=strchr(boundary, '='))) {
sapi_module.sapi_error(E_WARNING, "Missing boundary in multipart/form-data POST data");
return;
@@ -973,7 +989,13 @@
/* If file_uploads=off, skip the file part */
if (!PG(file_uploads)) {
skip_upload = 1;
- }
+ }
+#if PHP_VERSION_ID >= 50302 || (PHP_VERSION_ID >= 50212 && PHP_VERSION_ID < 50300)
+ else if (upload_cnt <= 0) {
+ skip_upload = 1;
+ sapi_module.sapi_error(E_WARNING, "Maximum number of allowable file uploads has been exceeded");
+ }
+#endif
/* Return with an error if the posted data is garbled */
if (!param && !filename) {
@@ -1019,6 +1041,9 @@
/* Handle file */
fd = php_open_temporary_fd(PG(upload_tmp_dir), "php", &temp_filename TSRMLS_CC);
+#if PHP_VERSION_ID >= 50302 || (PHP_VERSION_ID >= 50212 && PHP_VERSION_ID < 50300)
+ upload_cnt--;
+#endif
if (fd==-1) {
sapi_module.sapi_error(E_WARNING, "File upload error - unable to create a temporary file");
cancel_upload = UPLOAD_ERROR_E;
@@ -1075,12 +1100,12 @@
}
- if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
+ if (PG(upload_max_filesize) > 0 && total_bytes+blen > PG(upload_max_filesize)) {
#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%s=%s] not saved", PG(upload_max_filesize), param, filename);
#endif
cancel_upload = UPLOAD_ERROR_A;
- } else if (max_file_size && (total_bytes > max_file_size)) {
+ } else if (max_file_size && (total_bytes+blen > max_file_size)) {
#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE, "MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved", max_file_size, param, filename);
#endif
@@ -1270,26 +1295,30 @@
}
s = "";
- /* Initialize variables */
- add_protected_variable(param TSRMLS_CC);
+ {
+ /* store temp_filename as-is (without magic_quotes_gpc-ing it, in case upload_tmp_dir
+ * contains escapeable characters. escape only the variable name.) */
+ zval zfilename;
+
+ /* Initialize variables */
+ add_protected_variable(param TSRMLS_CC);
+
+ /* if param is of form xxx[.*] this will cut it to xxx */
+ if (!is_anonymous) {
+ ZVAL_STRING(&zfilename, temp_filename, 1);
+ safe_php_register_variable_ex(param, &zfilename, NULL, 1 TSRMLS_CC);
+ }
- magic_quotes_gpc = PG(magic_quotes_gpc);
- PG(magic_quotes_gpc) = 0;
- /* if param is of form xxx[.*] this will cut it to xxx */
- if (!is_anonymous) {
- safe_php_register_variable(param, temp_filename, NULL, 1 TSRMLS_CC);
- }
-
- /* Add $foo[tmp_name] */
- if (is_arr_upload) {
- sprintf(lbuf, "%s[tmp_name][%s]", abuf, array_index);
- } else {
- sprintf(lbuf, "%s[tmp_name]", param);
+ /* Add $foo[tmp_name] */
+ if (is_arr_upload) {
+ sprintf(lbuf, "%s[tmp_name][%s]", abuf, array_index);
+ } else {
+ sprintf(lbuf, "%s[tmp_name]", param);
+ }
+ add_protected_variable(lbuf TSRMLS_CC);
+ ZVAL_STRING(&zfilename, temp_filename, 1);
+ register_http_post_files_variable_ex(lbuf, &zfilename, http_post_files, 1 TSRMLS_CC);
}
- add_protected_variable(lbuf TSRMLS_CC);
- register_http_post_files_variable(lbuf, temp_filename, http_post_files, 1 TSRMLS_CC);
-
- PG(magic_quotes_gpc) = magic_quotes_gpc;
{
zval file_size, error_type;
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/session.c
^
|
| @@ -1,19 +1,19 @@
/*
+----------------------------------------------------------------------+
- | Suhosin Version 1 |
+ | Suhosin Version 1 |
+----------------------------------------------------------------------+
- | Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2006-2007 The Hardened-PHP Project |
+ | Copyright (c) 2007-2012 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 |
+ | 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. |
+ | 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> |
+ | Author: Stefan Esser <sesser@sektioneins.de> |
+----------------------------------------------------------------------+
*/
/*
@@ -30,8 +30,16 @@
#include "php_ini.h"
#include "php_suhosin.h"
#include "ext/standard/base64.h"
+#include "ext/standard/php_smart_str.h"
+#include "ext/standard/php_var.h"
#include "sha256.h"
+#include <fcntl.h>
+
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
+# include "ext/hash/php_hash.h"
+#endif
+
#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name TSRMLS_DC
#define PS_CLOSE_ARGS void **mod_data TSRMLS_DC
#define PS_READ_ARGS void **mod_data, const char *key, char **val, int *vallen TSRMLS_DC
@@ -41,143 +49,196 @@
#define PS_CREATE_SID_ARGS void **mod_data, int *newlen TSRMLS_DC
typedef struct ps_module_struct {
- const char *s_name;
- int (*s_open)(PS_OPEN_ARGS);
- int (*s_close)(PS_CLOSE_ARGS);
- int (*s_read)(PS_READ_ARGS);
- int (*s_write)(PS_WRITE_ARGS);
- int (*s_destroy)(PS_DESTROY_ARGS);
- int (*s_gc)(PS_GC_ARGS);
- char *(*s_create_sid)(PS_CREATE_SID_ARGS);
+ const char *s_name;
+ int (*s_open)(PS_OPEN_ARGS);
+ int (*s_close)(PS_CLOSE_ARGS);
+ int (*s_read)(PS_READ_ARGS);
+ int (*s_write)(PS_WRITE_ARGS);
+ int (*s_destroy)(PS_DESTROY_ARGS);
+ int (*s_gc)(PS_GC_ARGS);
+ char *(*s_create_sid)(PS_CREATE_SID_ARGS);
} ps_module;
typedef enum {
- php_session_disabled,
- php_session_none,
- php_session_active
+ php_session_disabled,
+ php_session_none,
+ php_session_active
} php_session_status;
#define PS_SERIALIZER_ENCODE_ARGS char **newstr, int *newlen TSRMLS_DC
#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen TSRMLS_DC
typedef struct ps_serializer_struct {
- const char *name;
- int (*encode)(PS_SERIALIZER_ENCODE_ARGS);
- int (*decode)(PS_SERIALIZER_DECODE_ARGS);
+ const char *name;
+ int (*encode)(PS_SERIALIZER_ENCODE_ARGS);
+ int (*decode)(PS_SERIALIZER_DECODE_ARGS);
} ps_serializer;
typedef struct _php_ps_globals_43_44 {
- char *save_path;
- char *session_name;
- char *id;
- char *extern_referer_chk;
- char *entropy_file;
- char *cache_limiter;
- long entropy_length;
- long cookie_lifetime;
- char *cookie_path;
- char *cookie_domain;
- zend_bool cookie_secure;
- ps_module *mod;
- void *mod_data;
- php_session_status session_status;
- long gc_probability;
- long gc_divisor;
- long gc_maxlifetime;
- int module_number;
- long cache_expire;
- zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
- zend_bool bug_compat_warn; /* Whether to warn about it */
- const struct ps_serializer_struct *serializer;
- zval *http_session_vars;
- zend_bool auto_start;
- zend_bool use_cookies;
- zend_bool use_only_cookies;
- zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
- zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */
- int send_cookie;
- int define_sid;
+ char *save_path;
+ char *session_name;
+ char *id;
+ char *extern_referer_chk;
+ char *entropy_file;
+ char *cache_limiter;
+ long entropy_length;
+ long cookie_lifetime;
+ char *cookie_path;
+ char *cookie_domain;
+ zend_bool cookie_secure;
+ ps_module *mod;
+ void *mod_data;
+ php_session_status session_status;
+ long gc_probability;
+ long gc_divisor;
+ long gc_maxlifetime;
+ int module_number;
+ long cache_expire;
+ zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
+ zend_bool bug_compat_warn; /* Whether to warn about it */
+ const struct ps_serializer_struct *serializer;
+ zval *http_session_vars;
+ zend_bool auto_start;
+ zend_bool use_cookies;
+ zend_bool use_only_cookies;
+ zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
+ zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */
+ int send_cookie;
+ int define_sid;
} php_ps_globals_43_44;
typedef struct _php_ps_globals_50_51 {
- char *save_path;
- char *session_name;
- char *id;
- char *extern_referer_chk;
- char *entropy_file;
- char *cache_limiter;
- long entropy_length;
- long cookie_lifetime;
- char *cookie_path;
- char *cookie_domain;
- zend_bool cookie_secure;
- ps_module *mod;
- void *mod_data;
- php_session_status session_status;
- long gc_probability;
- long gc_divisor;
- long gc_maxlifetime;
- int module_number;
- long cache_expire;
- zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
- zend_bool bug_compat_warn; /* Whether to warn about it */
- const struct ps_serializer_struct *serializer;
- zval *http_session_vars;
- zend_bool auto_start;
- zend_bool use_cookies;
- zend_bool use_only_cookies;
- zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
- zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */
-
- long hash_func;
- long hash_bits_per_character;
- int send_cookie;
- int define_sid;
+ char *save_path;
+ char *session_name;
+ char *id;
+ char *extern_referer_chk;
+ char *entropy_file;
+ char *cache_limiter;
+ long entropy_length;
+ long cookie_lifetime;
+ char *cookie_path;
+ char *cookie_domain;
+ zend_bool cookie_secure;
+ ps_module *mod;
+ void *mod_data;
+ php_session_status session_status;
+ long gc_probability;
+ long gc_divisor;
+ long gc_maxlifetime;
+ int module_number;
+ long cache_expire;
+ zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
+ zend_bool bug_compat_warn; /* Whether to warn about it */
+ const struct ps_serializer_struct *serializer;
+ zval *http_session_vars;
+ zend_bool auto_start;
+ zend_bool use_cookies;
+ zend_bool use_only_cookies;
+ zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
+ zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */
+
+ long hash_func;
+ long hash_bits_per_character;
+ int send_cookie;
+ int define_sid;
} php_ps_globals_50_51;
-typedef struct _php_ps_globals_52_60 {
- char *save_path;
- char *session_name;
- char *id;
- char *extern_referer_chk;
- char *entropy_file;
- char *cache_limiter;
- long entropy_length;
- long cookie_lifetime;
- char *cookie_path;
- char *cookie_domain;
- zend_bool cookie_secure;
- zend_bool cookie_httponly;
- ps_module *mod;
- void *mod_data;
- php_session_status session_status;
- long gc_probability;
- long gc_divisor;
- long gc_maxlifetime;
- int module_number;
- long cache_expire;
- zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
- zend_bool bug_compat_warn; /* Whether to warn about it */
- const struct ps_serializer_struct *serializer;
- zval *http_session_vars;
- zend_bool auto_start;
- zend_bool use_cookies;
- zend_bool use_only_cookies;
- zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
- zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */
-
- long hash_func;
- long hash_bits_per_character;
- int send_cookie;
- int define_sid;
- zend_bool invalid_session_id; /* allows the driver to report about an invalid session id and request id regeneration */
-} php_ps_globals_52_60;
-
+typedef struct _php_ps_globals_52 {
+ char *save_path;
+ char *session_name;
+ char *id;
+ char *extern_referer_chk;
+ char *entropy_file;
+ char *cache_limiter;
+ long entropy_length;
+ long cookie_lifetime;
+ char *cookie_path;
+ char *cookie_domain;
+ zend_bool cookie_secure;
+ zend_bool cookie_httponly;
+ ps_module *mod;
+ void *mod_data;
+ php_session_status session_status;
+ long gc_probability;
+ long gc_divisor;
+ long gc_maxlifetime;
+ int module_number;
+ long cache_expire;
+ zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
+ zend_bool bug_compat_warn; /* Whether to warn about it */
+ const struct ps_serializer_struct *serializer;
+ zval *http_session_vars;
+ zend_bool auto_start;
+ zend_bool use_cookies;
+ zend_bool use_only_cookies;
+ zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
+ zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */
+
+ long hash_func;
+ long hash_bits_per_character;
+ int send_cookie;
+ int define_sid;
+ zend_bool invalid_session_id; /* allows the driver to report about an invalid session id and request id regeneration */
+} php_ps_globals_52;
+
+typedef struct _php_ps_globals_53 {
+ char *save_path;
+ char *session_name;
+ char *id;
+ char *extern_referer_chk;
+ char *entropy_file;
+ char *cache_limiter;
+ long entropy_length;
+ long cookie_lifetime;
+ char *cookie_path;
+ char *cookie_domain;
+ zend_bool cookie_secure;
+ zend_bool cookie_httponly;
+ ps_module *mod;
+ void *mod_data;
+ php_session_status session_status;
+ long gc_probability;
+ long gc_divisor;
+ long gc_maxlifetime;
+ int module_number;
+ long cache_expire;
+ union {
+ zval *names[6];
+ struct {
+ zval *ps_open;
+ zval *ps_close;
+ zval *ps_read;
+ zval *ps_write;
+ zval *ps_destroy;
+ zval *ps_gc;
+ } name;
+ } mod_user_names;
+ zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
+ zend_bool bug_compat_warn; /* Whether to warn about it */
+ const struct ps_serializer_struct *serializer;
+ zval *http_session_vars;
+ zend_bool auto_start;
+ zend_bool use_cookies;
+ zend_bool use_only_cookies;
+ zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
+ zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */
+
+ long hash_func;
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
+ php_hash_ops *hash_ops;
+#endif
+ long hash_bits_per_character;
+ int send_cookie;
+ int define_sid;
+ zend_bool invalid_session_id; /* allows the driver to report about an invalid session id and request id regeneration */
+} php_ps_globals_53;
#ifdef ZTS
static ts_rsrc_id session_globals_id = 0;
-# if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2)
-# define SESSION_G(v) TSRMG(session_globals_id, php_ps_globals_52_60 *, v)
+# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3)
+# define SESSION_G(v) TSRMG(session_globals_id, php_ps_globals_53 *, v)
+# elif (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2)
+# define SESSION_G(v) TSRMG(session_globals_id, php_ps_globals_52 *, v)
# elif (PHP_MAJOR_VERSION == 5)
# define SESSION_G(v) TSRMG(session_globals_id, php_ps_globals_50_51 *, v)
# elif (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION >= 3)
@@ -186,8 +247,10 @@
UNSUPPORTED PHP VERSION
# endif
#else
-# if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2)
-static php_ps_globals_52_60 *session_globals = NULL;
+# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3)
+static php_ps_globals_53 *session_globals = NULL;
+# elif (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2)
+static php_ps_globals_52 *session_globals = NULL;
# elif (PHP_MAJOR_VERSION == 5)
static php_ps_globals_50_51 *session_globals = NULL;
# elif (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION >= 3)
@@ -198,95 +261,203 @@
#define SESSION_G(v) (session_globals->v)
#endif
+ps_serializer *(*suhosin_find_ps_serializer)(char *name TSRMLS_DC) = NULL;
+
+#define PS_ENCODE_VARS \
+ char *key; \
+ uint key_length; \
+ ulong num_key; \
+ zval **struc;
+
+#define PS_ENCODE_LOOP(code) do { \
+ HashTable *_ht = Z_ARRVAL_P(SESSION_G(http_session_vars)); \
+ int key_type; \
+ \
+ for (zend_hash_internal_pointer_reset(_ht); \
+ (key_type = zend_hash_get_current_key_ex(_ht, &key, &key_length, &num_key, 0, NULL)) != HASH_KEY_NON_EXISTANT; \
+ zend_hash_move_forward(_ht)) { \
+ if (key_type == HASH_KEY_IS_LONG) { \
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Skipping numeric key %ld", num_key); \
+ continue; \
+ } \
+ key_length--; \
+ if (suhosin_get_session_var(key, key_length, &struc TSRMLS_CC) == SUCCESS) { \
+ code; \
+ } \
+ } \
+ } while(0)
+
+static int suhosin_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC) /* {{{ */
+{
+ int ret = FAILURE;
+
+ if (SESSION_G(http_session_vars) && SESSION_G(http_session_vars)->type == IS_ARRAY) {
+ ret = zend_hash_find(Z_ARRVAL_P(SESSION_G(http_session_vars)), name, namelen + 1, (void **) state_var);
+
+ /* If register_globals is enabled, and
+ * if there is an entry for the slot in $_SESSION, and
+ * if that entry is still set to NULL, and
+ * if the global var exists, then
+ * we prefer the same key in the global sym table. */
+
+ if (PG(register_globals) && ret == SUCCESS && Z_TYPE_PP(*state_var) == IS_NULL) {
+ zval **tmp;
+
+ if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void **) &tmp) == SUCCESS) {
+ *state_var = tmp;
+ }
+ }
+ }
+ return ret;
+}
+
+#define PS_DELIMITER '|'
+#define PS_UNDEF_MARKER '!'
+
+int suhosin_session_encode(char **newstr, int *newlen TSRMLS_DC)
+{
+ smart_str buf = {0};
+ php_serialize_data_t var_hash;
+ PS_ENCODE_VARS;
+
+ PHP_VAR_SERIALIZE_INIT(var_hash);
+
+ PS_ENCODE_LOOP(
+ smart_str_appendl(&buf, key, key_length);
+ if (key[0] == PS_UNDEF_MARKER || memchr(key, PS_DELIMITER, key_length)) {
+ PHP_VAR_SERIALIZE_DESTROY(var_hash);
+ smart_str_free(&buf);
+ return FAILURE;
+ }
+ smart_str_appendc(&buf, PS_DELIMITER);
+
+ php_var_serialize(&buf, struc, &var_hash TSRMLS_CC);
+ } else {
+ smart_str_appendc(&buf, PS_UNDEF_MARKER);
+ smart_str_appendl(&buf, key, key_length);
+ smart_str_appendc(&buf, PS_DELIMITER);
+ );
+
+ if (newlen) {
+ *newlen = buf.len;
+ }
+ smart_str_0(&buf);
+ *newstr = buf.c;
+
+ PHP_VAR_SERIALIZE_DESTROY(var_hash);
+ return SUCCESS;
+}
+
+static void suhosin_send_cookie(TSRMLS_D)
+{
+ int * session_send_cookie = &SESSION_G(send_cookie);
+ char * base;
+ zend_ini_entry *ini_entry;
+
+ /* The following is requires to be 100% compatible to PHP
+ versions where the hash extension is not available by default */
+#if (PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3)
+ if (zend_hash_find(EG(ini_directives), "session.hash_bits_per_character", sizeof("session.hash_bits_per_character"), (void **) &ini_entry) == SUCCESS) {
+#ifndef ZTS
+ base = (char *) ini_entry->mh_arg2;
+#else
+ base = (char *) ts_resource(*((int *) ini_entry->mh_arg2));
+#endif
+ session_send_cookie = (int *) (base+(size_t) ini_entry->mh_arg1+sizeof(long));
+ }
+#endif
+ *session_send_cookie = 1;
+}
+
void suhosin_get_ipv4(char *buf TSRMLS_DC)
{
- char *raddr = sapi_getenv("REMOTE_ADDR", sizeof("REMOTE_ADDR")-1 TSRMLS_CC);
- int i;
+ char *raddr = suhosin_getenv("REMOTE_ADDR", sizeof("REMOTE_ADDR")-1 TSRMLS_CC);
+ int i;
- if (raddr == NULL) {
- memset(buf, 0, 4);
- return;
- }
-
- for (i=0; i<4; i++) {
- if (raddr[0] == 0) {
- buf[i] = 0;
- } else {
- buf[i] = strtol(raddr, &raddr, 10);
- if (raddr[0] == '.') {
- raddr++;
- }
- }
- }
+ if (raddr == NULL) {
+ memset(buf, 0, 4);
+ return;
+ }
+
+ for (i=0; i<4; i++) {
+ if (raddr[0] == 0) {
+ buf[i] = 0;
+ } else {
+ buf[i] = strtol(raddr, &raddr, 10);
+ if (raddr[0] == '.') {
+ raddr++;
+ }
+ }
+ }
}
char *suhosin_encrypt_string(char *str, int len, char *var, int vlen, char *key TSRMLS_DC)
{
int padded_len, i, slen;
unsigned char *crypted, *tmp;
- unsigned int check = 0x13579BDF;
-
+ unsigned int check = 0x13579BDF;
+
if (str == NULL) {
- return NULL;
+ return NULL;
+ }
+ if (len == 0) {
+ return estrndup("", 0);
}
- if (len == 0) {
- return estrndup("", 0);
- }
suhosin_aes_gkey(4,8,key TSRMLS_CC);
padded_len = ((len+15) & ~0xF);
crypted = emalloc(16+padded_len+1);
- memset(crypted, 0xff, 16+padded_len+1);
+ memset(crypted, 0xff, 16+padded_len+1);
memcpy(crypted+16, str, len+1);
- /* calculate check value */
- for (i = 0; i<vlen; i++) {
- check = (check << 3) | (check >> (32-3));
- check += check << 1;
- check ^= (unsigned char)var[i];
- }
- for (i = 0; i<len; i++) {
- check = (check << 3) | (check >> (32-3));
- check += check << 1;
- check ^= (unsigned char)str[i];
- }
-
- /* store ip value */
- suhosin_get_ipv4(crypted+4 TSRMLS_CC);
-
- /* store check value */
- crypted[8] = check & 0xff;
- crypted[9] = (check >> 8) & 0xff;
- crypted[10] = (check >> 16) & 0xff;
- crypted[11] = (check >> 24) & 0xff;
-
- /* store original length */
- crypted[12] = len & 0xff;
- crypted[13] = (len >> 8) & 0xff;
- crypted[14] = (len >> 16) & 0xff;
- crypted[15] = (len >> 24) & 0xff;
-
+ /* calculate check value */
+ for (i = 0; i<vlen; i++) {
+ check = (check << 3) | (check >> (32-3));
+ check += check << 1;
+ check ^= (unsigned char)var[i];
+ }
+ for (i = 0; i<len; i++) {
+ check = (check << 3) | (check >> (32-3));
+ check += check << 1;
+ check ^= (unsigned char)str[i];
+ }
+
+ /* store ip value */
+ suhosin_get_ipv4(crypted+4 TSRMLS_CC);
+
+ /* store check value */
+ crypted[8] = check & 0xff;
+ crypted[9] = (check >> 8) & 0xff;
+ crypted[10] = (check >> 16) & 0xff;
+ crypted[11] = (check >> 24) & 0xff;
+
+ /* store original length */
+ crypted[12] = len & 0xff;
+ crypted[13] = (len >> 8) & 0xff;
+ crypted[14] = (len >> 16) & 0xff;
+ crypted[15] = (len >> 24) & 0xff;
+
for (i=0, tmp=crypted; i<padded_len+16; i+=16, tmp+=16) {
if (i > 0) {
- int j;
+ int j;
for (j=0; j<16; j++) tmp[j] ^= tmp[j-16];
}
suhosin_aes_encrypt((char *)tmp TSRMLS_CC);
}
-
+
tmp = php_base64_encode(crypted, padded_len+16, NULL);
efree(crypted);
slen=strlen((char *)tmp);
- for (i=0; i<slen; i++) {
- switch (tmp[i]) {
- case '/': tmp[i]='-'; break;
- case '=': tmp[i]='.'; break;
- case '+': tmp[i]='_'; break;
- }
- }
+ for (i=0; i<slen; i++) {
+ switch (tmp[i]) {
+ case '/': tmp[i]='-'; break;
+ case '=': tmp[i]='.'; break;
+ case '+': tmp[i]='_'; break;
+ }
+ }
return (char *)tmp;
}
@@ -294,162 +465,162 @@
{
int len, i, o_len, invalid = 0;
unsigned char *decrypted, *tmp;
- unsigned int check = 0x13579BDF;
+ unsigned int check = 0x13579BDF;
char buf[4];
-
+
if (str == NULL) {
- return NULL;
+ return NULL;
+ }
+
+ if (padded_len == 0) {
+ if (orig_len) {
+ *orig_len = 0;
+ }
+ return estrndup("", 0);
}
-
- if (padded_len == 0) {
- if (orig_len) {
- *orig_len = 0;
- }
- return estrndup("", 0);
- }
suhosin_aes_gkey(4,8,key TSRMLS_CC);
- for (i=0; i<padded_len; i++) {
- switch (str[i]) {
- case '-': str[i]='/'; break;
- case '.': str[i]='='; break;
- case '_': str[i]='+'; break;
- }
- }
-
+ for (i=0; i<padded_len; i++) {
+ switch (str[i]) {
+ case '-': str[i]='/'; break;
+ case '.': str[i]='='; break;
+ case '_': str[i]='+'; break;
+ }
+ }
+
decrypted = php_base64_decode((unsigned char *)str, padded_len, &len);
- if (decrypted == NULL || len < 2*16 || (len % 16) != 0) {
+ if (decrypted == NULL || len < 2*16 || (len % 16) != 0) {
error_out:
- if (decrypted != NULL) {
- efree(decrypted);
- }
- if (orig_len) {
- *orig_len = 0;
- }
- return NULL;
- }
-
+ if (decrypted != NULL) {
+ efree(decrypted);
+ }
+ if (orig_len) {
+ *orig_len = 0;
+ }
+ return NULL;
+ }
+
for (i=len-16, tmp=decrypted+i; i>=0; i-=16, tmp-=16) {
- suhosin_aes_decrypt((char *)tmp TSRMLS_CC);
- if (i > 0) {
- int j;
- for (j=0; j<16; j++) tmp[j] ^= tmp[j-16];
+ suhosin_aes_decrypt((char *)tmp TSRMLS_CC);
+ if (i > 0) {
+ int j;
+ for (j=0; j<16; j++) tmp[j] ^= tmp[j-16];
+ }
+ }
+
+ /* retrieve orig_len */
+ o_len = decrypted[15];
+ o_len <<= 8;
+ o_len |= decrypted[14];
+ o_len <<= 8;
+ o_len |= decrypted[13];
+ o_len <<= 8;
+ o_len |= decrypted[12];
+
+ if (o_len < 0 || o_len > len-16) {
+ goto error_out;
+ }
+
+ /* calculate check value */
+ for (i = 0; i<vlen; i++) {
+ check = (check << 3) | (check >> (32-3));
+ check += check << 1;
+ check ^= (unsigned char)var[i];
+ }
+ for (i = 0; i<o_len; i++) {
+ check = (check << 3) | (check >> (32-3));
+ check += check << 1;
+ check ^= decrypted[16+i];
+ }
+
+ /* check value */
+ invalid = (decrypted[8] != (check & 0xff)) ||
+ (decrypted[9] != ((check >> 8) & 0xff)) ||
+ (decrypted[10] != ((check >> 16) & 0xff)) ||
+ (decrypted[11] != ((check >> 24) & 0xff));
+
+ /* check IP */
+ if (check_ra > 0) {
+ if (check_ra > 4) {
+ check_ra = 4;
}
+ suhosin_get_ipv4(&buf TSRMLS_CC);
+ if (memcmp(buf, decrypted+4, check_ra) != 0) {
+ goto error_out;
+ }
+ }
+
+ if (invalid) {
+ goto error_out;
}
-
- /* retrieve orig_len */
- o_len = decrypted[15];
- o_len <<= 8;
- o_len |= decrypted[14];
- o_len <<= 8;
- o_len |= decrypted[13];
- o_len <<= 8;
- o_len |= decrypted[12];
-
- if (o_len < 0 || o_len > len-16) {
- goto error_out;
- }
-
- /* calculate check value */
- for (i = 0; i<vlen; i++) {
- check = (check << 3) | (check >> (32-3));
- check += check << 1;
- check ^= (unsigned char)var[i];
- }
- for (i = 0; i<o_len; i++) {
- check = (check << 3) | (check >> (32-3));
- check += check << 1;
- check ^= decrypted[16+i];
- }
-
- /* check value */
- invalid = (decrypted[8] != (check & 0xff)) ||
- (decrypted[9] != ((check >> 8) & 0xff)) ||
- (decrypted[10] != ((check >> 16) & 0xff)) ||
- (decrypted[11] != ((check >> 24) & 0xff));
-
- /* check IP */
- if (check_ra > 0) {
- if (check_ra > 4) {
- check_ra = 4;
- }
- suhosin_get_ipv4(&buf TSRMLS_CC);
- if (memcmp(buf, decrypted+4, check_ra) != 0) {
- goto error_out;
- }
- }
-
- if (invalid) {
- goto error_out;
- }
-
- if (orig_len) {
- *orig_len = o_len;
- }
-
- memmove(decrypted, decrypted+16, o_len);
- decrypted[o_len] = 0;
- /* we do not realloc() here because 16 byte less
- is simply not worth the overhead */
- return (char *)decrypted;
+
+ if (orig_len) {
+ *orig_len = o_len;
+ }
+
+ memmove(decrypted, decrypted+16, o_len);
+ decrypted[o_len] = 0;
+ /* we do not realloc() here because 16 byte less
+ is simply not worth the overhead */
+ return (char *)decrypted;
}
char *suhosin_generate_key(char *key, zend_bool ua, zend_bool dr, long raddr, char *cryptkey TSRMLS_DC)
{
- char *_ua = NULL;
- char *_dr = NULL;
- char *_ra = NULL;
- suhosin_SHA256_CTX ctx;
-
- if (ua) {
- _ua = sapi_getenv("HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT")-1 TSRMLS_CC);
- }
-
- if (dr) {
- _dr = sapi_getenv("DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT")-1 TSRMLS_CC);
- }
-
- if (raddr > 0) {
- _ra = sapi_getenv("REMOTE_ADDR", sizeof("REMOTE_ADDR")-1 TSRMLS_CC);
- }
-
- SDEBUG("(suhosin_generate_key) KEY: %s - UA: %s - DR: %s - RA: %s", key,_ua,_dr,_ra);
-
- suhosin_SHA256Init(&ctx);
- if (key == NULL) {
- suhosin_SHA256Update(&ctx, (unsigned char*)"D3F4UL7", sizeof("D3F4UL7"));
- } else {
- suhosin_SHA256Update(&ctx, (unsigned char*)key, strlen(key));
- }
- if (_ua) {
- suhosin_SHA256Update(&ctx, (unsigned char*)_ua, strlen(_ua));
- }
- if (_dr) {
- suhosin_SHA256Update(&ctx, (unsigned char*)_dr, strlen(_dr));
- }
- if (_ra) {
- if (raddr >= 4) {
- suhosin_SHA256Update(&ctx, (unsigned char*)_ra, strlen(_ra));
- } else {
- long dots = 0;
- char *tmp = _ra;
-
- while (*tmp) {
- if (*tmp == '.') {
- dots++;
- if (dots == raddr) {
- break;
- }
- }
- tmp++;
- }
- suhosin_SHA256Update(&ctx, (unsigned char*)_ra, tmp-_ra);
- }
- }
- suhosin_SHA256Final((unsigned char *)cryptkey, &ctx);
- cryptkey[32] = 0; /* uhmm... not really a string */
-
- return cryptkey;
+ char *_ua = NULL;
+ char *_dr = NULL;
+ char *_ra = NULL;
+ suhosin_SHA256_CTX ctx;
+
+ if (ua) {
+ _ua = suhosin_getenv("HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT")-1 TSRMLS_CC);
+ }
+
+ if (dr) {
+ _dr = suhosin_getenv("DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT")-1 TSRMLS_CC);
+ }
+
+ if (raddr > 0) {
+ _ra = suhosin_getenv("REMOTE_ADDR", sizeof("REMOTE_ADDR")-1 TSRMLS_CC);
+ }
+
+ SDEBUG("(suhosin_generate_key) KEY: %s - UA: %s - DR: %s - RA: %s", key,_ua,_dr,_ra);
+
+ suhosin_SHA256Init(&ctx);
+ if (key == NULL) {
+ suhosin_SHA256Update(&ctx, (unsigned char*)"D3F4UL7", sizeof("D3F4UL7"));
+ } else {
+ suhosin_SHA256Update(&ctx, (unsigned char*)key, strlen(key));
+ }
+ if (_ua) {
+ suhosin_SHA256Update(&ctx, (unsigned char*)_ua, strlen(_ua));
+ }
+ if (_dr) {
+ suhosin_SHA256Update(&ctx, (unsigned char*)_dr, strlen(_dr));
+ }
+ if (_ra) {
+ if (raddr >= 4) {
+ suhosin_SHA256Update(&ctx, (unsigned char*)_ra, strlen(_ra));
+ } else {
+ long dots = 0;
+ char *tmp = _ra;
+
+ while (*tmp) {
+ if (*tmp == '.') {
+ dots++;
+ if (dots == raddr) {
+ break;
+ }
+ }
+ tmp++;
+ }
+ suhosin_SHA256Update(&ctx, (unsigned char*)_ra, tmp-_ra);
+ }
+ }
+ suhosin_SHA256Final((unsigned char *)cryptkey, &ctx);
+ cryptkey[32] = 0; /* uhmm... not really a string */
+
+ return cryptkey;
}
@@ -458,249 +629,270 @@
static int suhosin_hook_s_read(void **mod_data, const char *key, char **val, int *vallen TSRMLS_DC)
{
- int r;
-
- int i;char *v,*KEY=(char *)key;
-
- /* protect session vars */
-/* if (SESSION_G(http_session_vars) && SESSION_G(http_session_vars)->type == IS_ARRAY) {
- SESSION_G(http_session_vars)->refcount++;
- }*/
-
- /* protect dumb session handlers */
- if (key == NULL || !key[0] || *mod_data == NULL) {
+ int r;
+
+ int i;char *v,*KEY=(char *)key;
+
+ /* protect session vars */
+/* if (SESSION_G(http_session_vars) && SESSION_G(http_session_vars)->type == IS_ARRAY) {
+ SESSION_G(http_session_vars)->refcount++;
+ }*/
+
+ /* protect dumb session handlers */
+ if (key == NULL || !key[0] || *mod_data == NULL) {
regenerate:
- SDEBUG("regenerating key is %s", key);
- KEY = SESSION_G(id) = SESSION_G(mod)->s_create_sid(&SESSION_G(mod_data), NULL TSRMLS_CC);
- SESSION_G(send_cookie) = 1;
- } else if (strlen(key) > SUHOSIN_G(session_max_id_length)) {
- suhosin_log(S_SESSION, "session id ('%s') exceeds maximum length - regenerating", KEY);
- if (!SUHOSIN_G(simulation)) {
- goto regenerate;
- }
- }
+ SDEBUG("regenerating key is %s", key);
+ KEY = SESSION_G(id) = SESSION_G(mod)->s_create_sid(&SESSION_G(mod_data), NULL TSRMLS_CC);
+ suhosin_send_cookie(TSRMLS_C);
+ } else if (strlen(key) > SUHOSIN_G(session_max_id_length)) {
+ suhosin_log(S_SESSION, "session id ('%s') exceeds maximum length - regenerating", KEY);
+ if (!SUHOSIN_G(simulation)) {
+ goto regenerate;
+ }
+ }
#if (PHP_MAJOR_VERSION < 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 2)
- else if (strpbrk(KEY, "\r\n\t <>'\"\\")) {
- suhosin_log(S_SESSION, "session id ('%s') contains invalid chars - regenerating", KEY);
- if (!SUHOSIN_G(simulation)) {
- goto regenerate;
- }
- }
-#endif
-
- r = SUHOSIN_G(old_s_read)(mod_data, KEY, val, vallen TSRMLS_CC);
-
- if (r == SUCCESS && SUHOSIN_G(session_encrypt) && *vallen > 0) {
- char cryptkey[33];
-
- SUHOSIN_G(do_not_scan) = 1;
- suhosin_generate_key(SUHOSIN_G(session_cryptkey), SUHOSIN_G(session_cryptua), SUHOSIN_G(session_cryptdocroot), SUHOSIN_G(session_cryptraddr), (char *)&cryptkey TSRMLS_CC);
-
- v = *val;
- i = *vallen;
- *val = suhosin_decrypt_string(v, i, "", 0, (char *)&cryptkey, vallen, SUHOSIN_G(session_checkraddr) TSRMLS_CC);
- SUHOSIN_G(do_not_scan) = 0;
- if (*val == NULL) {
- *val = estrndup("", 0);
- *vallen = 0;
- }
- efree(v);
- }
-
- return r;
+ else if (strpbrk(KEY, "\r\n\t <>'\"\\")) {
+ suhosin_log(S_SESSION, "session id ('%s') contains invalid chars - regenerating", KEY);
+ if (!SUHOSIN_G(simulation)) {
+ goto regenerate;
+ }
+ }
+#endif
+
+ r = SUHOSIN_G(old_s_read)(mod_data, KEY, val, vallen TSRMLS_CC);
+
+ if (r == SUCCESS && SUHOSIN_G(session_encrypt) && *vallen > 0) {
+ char cryptkey[33];
+
+ SUHOSIN_G(do_not_scan) = 1;
+ suhosin_generate_key(SUHOSIN_G(session_cryptkey), SUHOSIN_G(session_cryptua), SUHOSIN_G(session_cryptdocroot), SUHOSIN_G(session_cryptraddr), (char *)&cryptkey TSRMLS_CC);
+
+ v = *val;
+ i = *vallen;
+ *val = suhosin_decrypt_string(v, i, "", 0, (char *)&cryptkey, vallen, SUHOSIN_G(session_checkraddr) TSRMLS_CC);
+ SUHOSIN_G(do_not_scan) = 0;
+ if (*val == NULL) {
+ *val = estrndup("", 0);
+ *vallen = 0;
+ }
+ efree(v);
+ }
+
+ return r;
}
static int suhosin_hook_s_write(void **mod_data, const char *key, const char *val, const int vallen TSRMLS_DC)
{
- int r;
-/* int nullify = 0;*/
- char *v = (char *)val;
-
- /* protect dumb session handlers */
- if (key == NULL || !key[0] || val == NULL || strlen(key) > SUHOSIN_G(session_max_id_length) || *mod_data == NULL) {
- r = FAILURE;
- goto return_write;
- }
-
- r = vallen;
-
- if (r > 0 && SUHOSIN_G(session_encrypt)) {
- char cryptkey[33];
-
- SUHOSIN_G(do_not_scan) = 1;
-
- suhosin_generate_key(SUHOSIN_G(session_cryptkey), SUHOSIN_G(session_cryptua), SUHOSIN_G(session_cryptdocroot), SUHOSIN_G(session_cryptraddr), (char *)&cryptkey TSRMLS_CC);
-
- v = suhosin_encrypt_string(v, vallen, "", 0, (char *)&cryptkey TSRMLS_CC);
-
- SUHOSIN_G(do_not_scan) = 0;
- r = strlen(v);
- }
+ int r;
+/* int nullify = 0;*/
+ char *v = (char *)val;
+
+ /* protect dumb session handlers */
+ if (key == NULL || !key[0] || val == NULL || strlen(key) > SUHOSIN_G(session_max_id_length) || *mod_data == NULL) {
+ r = FAILURE;
+ goto return_write;
+ }
+
+ r = vallen;
- r = SUHOSIN_G(old_s_write)(mod_data, key, v, r TSRMLS_CC);
-
+ if (r > 0 && SUHOSIN_G(session_encrypt)) {
+ char cryptkey[33];
+
+ SUHOSIN_G(do_not_scan) = 1;
+
+ suhosin_generate_key(SUHOSIN_G(session_cryptkey), SUHOSIN_G(session_cryptua), SUHOSIN_G(session_cryptdocroot), SUHOSIN_G(session_cryptraddr), (char *)&cryptkey TSRMLS_CC);
+
+ v = suhosin_encrypt_string(v, vallen, "", 0, (char *)&cryptkey TSRMLS_CC);
+
+ SUHOSIN_G(do_not_scan) = 0;
+ r = strlen(v);
+ }
+
+ r = SUHOSIN_G(old_s_write)(mod_data, key, v, r TSRMLS_CC);
+
return_write:
- /* protect session vars */
-/* if (SESSION_G(http_session_vars) && SESSION_G(http_session_vars)->type == IS_ARRAY) {
- if (SESSION_G(http_session_vars)->refcount==1) {
- nullify = 1;
- }
- zval_ptr_dtor(&SESSION_G(http_session_vars));
- if (nullify) {
- suhosin_log(S_SESSION, "possible session variables double free attack stopped");
- SESSION_G(http_session_vars) = NULL;
- }
- }*/
+ /* protect session vars */
+/* if (SESSION_G(http_session_vars) && SESSION_G(http_session_vars)->type == IS_ARRAY) {
+ if (SESSION_G(http_session_vars)->refcount==1) {
+ nullify = 1;
+ }
+ zval_ptr_dtor(&SESSION_G(http_session_vars));
+ if (nullify) {
+ suhosin_log(S_SESSION, "possible session variables double free attack stopped");
+ SESSION_G(http_session_vars) = NULL;
+ }
+ }*/
- return r;
+ return r;
}
static int suhosin_hook_s_destroy(void **mod_data, const char *key TSRMLS_DC)
{
- int r;
+ int r;
- /* protect dumb session handlers */
- if (key == NULL || !key[0] || strlen(key) > SUHOSIN_G(session_max_id_length) || *mod_data == NULL) {
- return FAILURE;
- }
-
- r = SUHOSIN_G(old_s_destroy)(mod_data, key TSRMLS_CC);
-
- return r;
+ /* protect dumb session handlers */
+ if (key == NULL || !key[0] || strlen(key) > SUHOSIN_G(session_max_id_length) || *mod_data == NULL) {
+ return FAILURE;
+ }
+
+ r = SUHOSIN_G(old_s_destroy)(mod_data, key TSRMLS_CC);
+
+ return r;
}
static void suhosin_hook_session_module(TSRMLS_D)
{
- ps_module *old_mod = SESSION_G(mod), *mod;
+ ps_module *old_mod = SESSION_G(mod), *mod;
- if (old_mod == NULL || SUHOSIN_G(s_module) == old_mod) {
- return;
- }
- if (SUHOSIN_G(s_module) == NULL) {
- SUHOSIN_G(s_module) = mod = malloc(sizeof(ps_module));
- if (mod == NULL) {
- return;
- }
- }
- mod = SUHOSIN_G(s_module);
- memcpy(mod, old_mod, sizeof(ps_module));
-
- SUHOSIN_G(old_s_read) = mod->s_read;
- mod->s_read = suhosin_hook_s_read;
- SUHOSIN_G(old_s_write) = mod->s_write;
- mod->s_write = suhosin_hook_s_write;
- SUHOSIN_G(old_s_destroy) = mod->s_destroy;
- mod->s_destroy = suhosin_hook_s_destroy;
-
- SESSION_G(mod) = mod;
+ if (old_mod == NULL || SUHOSIN_G(s_module) == old_mod) {
+ return;
+ }
+ if (SUHOSIN_G(s_module) == NULL) {
+ SUHOSIN_G(s_module) = mod = malloc(sizeof(ps_module));
+ if (mod == NULL) {
+ return;
+ }
+ }
+ mod = SUHOSIN_G(s_module);
+ memcpy(mod, old_mod, sizeof(ps_module));
+
+ SUHOSIN_G(old_s_read) = mod->s_read;
+ mod->s_read = suhosin_hook_s_read;
+ SUHOSIN_G(old_s_write) = mod->s_write;
+ mod->s_write = suhosin_hook_s_write;
+ SUHOSIN_G(old_s_destroy) = mod->s_destroy;
+ mod->s_destroy = suhosin_hook_s_destroy;
+
+ SESSION_G(mod) = mod;
}
static PHP_INI_MH(suhosin_OnUpdateSaveHandler)
{
- int r;
+ int r;
- r = old_OnUpdateSaveHandler(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
-
- suhosin_hook_session_module(TSRMLS_C);
-
- return r;
+ r = old_OnUpdateSaveHandler(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+
+ suhosin_hook_session_module(TSRMLS_C);
+
+ return r;
}
static int suhosin_hook_session_RINIT(INIT_FUNC_ARGS)
{
- if (SESSION_G(mod) == NULL) {
- char *value = zend_ini_string("session.save_handler", sizeof("session.save_handler"), 0);
-
- if (value) {
- suhosin_OnUpdateSaveHandler(NULL, value, strlen(value), NULL, NULL, NULL, 0 TSRMLS_CC);
- }
- }
- return old_SessionRINIT(INIT_FUNC_ARGS_PASSTHRU);
+ if (SESSION_G(mod) == NULL) {
+ char *value = zend_ini_string("session.save_handler", sizeof("session.save_handler"), 0);
+
+ if (value) {
+ suhosin_OnUpdateSaveHandler(NULL, value, strlen(value), NULL, NULL, NULL, 0 TSRMLS_CC);
+ }
+ }
+ return old_SessionRINIT(INIT_FUNC_ARGS_PASSTHRU);
}
void suhosin_hook_session(TSRMLS_D)
{
- zend_ini_entry *ini_entry;
- zend_module_entry *module;
+ ps_serializer *serializer;
+ zend_ini_entry *ini_entry;
+ zend_module_entry *module;
#ifdef ZTS
- ts_rsrc_id *ps_globals_id_ptr;
+ ts_rsrc_id *ps_globals_id_ptr;
#endif
-
- if (zend_hash_find(&module_registry, "session", sizeof("session"), (void**)&module) == FAILURE) {
- return;
- }
+
+ if (zend_hash_find(&module_registry, "session", sizeof("session"), (void**)&module) == FAILURE) {
+ return;
+ }
/* retrieve globals from module entry struct if possible */
#if PHP_VERSION_ID >= 50200
#ifdef ZTS
if (session_globals_id == 0) {
- session_globals_id = *module->globals_id_ptr;
+ session_globals_id = *module->globals_id_ptr;
}
#else
if (session_globals == NULL) {
- session_globals = module->globals_ptr;
+ session_globals = module->globals_ptr;
}
#endif
#else
- /* retrieve globals from symbols if PHP version is old */
+ /* retrieve globals from symbols if PHP version is old */
#ifdef ZTS
- if (session_globals_id == 0) {
- ps_globals_id_ptr = DL_FETCH_SYMBOL(module->handle, "ps_globals_id");
- if (ps_globals_id_ptr == NULL) {
- ps_globals_id_ptr = DL_FETCH_SYMBOL(module->handle, "_ps_globals_id");
- }
- if (ps_globals_id_ptr == NULL) {
- return;
- }
-
- session_globals_id = *ps_globals_id_ptr;
- }
+ if (session_globals_id == 0) {
+ ps_globals_id_ptr = DL_FETCH_SYMBOL(module->handle, "ps_globals_id");
+ if (ps_globals_id_ptr == NULL) {
+ ps_globals_id_ptr = DL_FETCH_SYMBOL(module->handle, "_ps_globals_id");
+ }
+ if (ps_globals_id_ptr == NULL) {
+ return;
+ }
+
+ session_globals_id = *ps_globals_id_ptr;
+ }
#else
- if (session_globals == NULL) {
- session_globals = DL_FETCH_SYMBOL(module->handle, "ps_globals");
- if (session_globals == NULL) {
- session_globals = DL_FETCH_SYMBOL(module->handle, "_ps_globals");
- }
- if (session_globals == NULL) {
- return;
- }
- }
-#endif
-#endif
- if (old_OnUpdateSaveHandler != NULL) {
- return;
- }
-
- /* hook request startup function of session module */
- old_SessionRINIT = module->request_startup_func;
- module->request_startup_func = suhosin_hook_session_RINIT;
-
- /* retrieve pointer to session.save_handler ini entry */
- if (zend_hash_find(EG(ini_directives), "session.save_handler", sizeof("session.save_handler"), (void **) &ini_entry) == FAILURE) {
- return;
- }
- SUHOSIN_G(s_module) = NULL;
-
- /* replace OnUpdateMemoryLimit handler */
- old_OnUpdateSaveHandler = ini_entry->on_modify;
- ini_entry->on_modify = suhosin_OnUpdateSaveHandler;
-
- suhosin_hook_session_module(TSRMLS_C);
+ if (session_globals == NULL) {
+ session_globals = DL_FETCH_SYMBOL(module->handle, "ps_globals");
+ if (session_globals == NULL) {
+ session_globals = DL_FETCH_SYMBOL(module->handle, "_ps_globals");
+ }
+ if (session_globals == NULL) {
+ return;
+ }
+ }
+#endif
+#endif
+ if (old_OnUpdateSaveHandler != NULL) {
+ return;
+ }
+
+ /* hook request startup function of session module */
+ old_SessionRINIT = module->request_startup_func;
+ module->request_startup_func = suhosin_hook_session_RINIT;
+
+ /* retrieve pointer to session.save_handler ini entry */
+ if (zend_hash_find(EG(ini_directives), "session.save_handler", sizeof("session.save_handler"), (void **) &ini_entry) == FAILURE) {
+ return;
+ }
+ SUHOSIN_G(s_module) = NULL;
+
+ /* replace OnUpdateMemoryLimit handler */
+ old_OnUpdateSaveHandler = ini_entry->on_modify;
+ ini_entry->on_modify = suhosin_OnUpdateSaveHandler;
+
+ suhosin_hook_session_module(TSRMLS_C);
+
+ /* Protect the PHP serializer from ! attacks */
+# if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2)
+ serializer = SESSION_G(serializer);
+ if (serializer != NULL && strcmp(serializer->name, "php")==0) {
+ serializer->encode = suhosin_session_encode;
+ }
+#endif
+
+ /* increase session identifier entropy */
+ if (SESSION_G(entropy_length) == 0 || SESSION_G(entropy_file) == NULL) {
+
+ /* ensure that /dev/urandom exists */
+ int fd = VCWD_OPEN("/dev/urandom", O_RDONLY);
+ if (fd >= 0) {
+ close(fd);
+ SESSION_G(entropy_length) = 16;
+ SESSION_G(entropy_file) = pestrdup("/dev/urandom", 1);
+ }
+ }
}
void suhosin_unhook_session(TSRMLS_D)
{
- if (old_OnUpdateSaveHandler != NULL) {
- zend_ini_entry *ini_entry;
-
- /* retrieve pointer to session.save_handler ini entry */
- if (zend_hash_find(EG(ini_directives), "session.save_handler", sizeof("session.save_handler"), (void **) &ini_entry) == FAILURE) {
- return;
- }
- ini_entry->on_modify = old_OnUpdateSaveHandler;
-
- old_OnUpdateSaveHandler = NULL;
- }
+ if (old_OnUpdateSaveHandler != NULL) {
+ zend_ini_entry *ini_entry;
+
+ /* retrieve pointer to session.save_handler ini entry */
+ if (zend_hash_find(EG(ini_directives), "session.save_handler", sizeof("session.save_handler"), (void **) &ini_entry) == FAILURE) {
+ return;
+ }
+ ini_entry->on_modify = old_OnUpdateSaveHandler;
+
+ old_OnUpdateSaveHandler = NULL;
+ }
}
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/sha256.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/sha256.h
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/suhosin.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
@@ -62,7 +62,7 @@
SUHOSIN_EXT_VERSION,
"SektionEins GmbH",
"http://www.suhosin.org",
- "Copyright (c) 2007",
+ "Copyright (c) 2007-2012",
suhosin_module_startup,
suhosin_shutdown,
NULL,
@@ -191,6 +191,7 @@
{
suhosin_unhook_execute();
suhosin_unhook_header_handler();
+ suhosin_unhook_post_handlers();
if (ze != NULL) {
ze->startup = orig_module_startup;
@@ -960,7 +961,35 @@
/* }}} */
-/* {{{ php_suhosin_init_globals
+/* {{{ suhosin_getenv
+ */
+char *suhosin_getenv(char *name, size_t name_len TSRMLS_DC)
+{
+ if (sapi_module.getenv) {
+ char *value, *tmp = sapi_module.getenv(name, name_len TSRMLS_CC);
+ if (tmp) {
+ value = estrdup(tmp);
+ } else {
+ return NULL;
+ }
+ return value;
+ } else {
+ /* fallback to the system's getenv() function */
+ char *tmp;
+
+ name = estrndup(name, name_len);
+ tmp = getenv(name);
+ efree(name);
+ if (tmp) {
+ return(estrdup(tmp));
+ }
+ }
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ suhosin_bailout
*/
void suhosin_bailout(TSRMLS_D)
{
@@ -1068,21 +1097,19 @@
/* now hook a bunch of stuff */
suhosin_hook_memory_limit();
- suhosin_hook_crypt();
suhosin_hook_sha256();
suhosin_hook_ex_imp();
/* register the logo for phpinfo */
php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo, sizeof(suhosin_logo));
-#if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)
- /* perform LFS check */
-/* time_t check = sapi_get_request_time(TSRMLS_C);
- if (SG(global_request_time) != check) {
- zend_error(E_ERROR, "It seems that PHP and Suhosin were compiled with different binary layouts. "
- "This will cause problems like POST not working. Please tell your distributor to fix this.");
- }*/
+#if PHP_MAJOR_VERSION < 5
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Suhosin Extension is not designed to run with PHP 4 and below. Erroring Out.");
+#endif
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <= 2
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Suhosin Extension does not officially support PHP 5.2 and below anymore, because it is discontinued. Use it at your own risk.");
#endif
+
return SUCCESS;
}
/* }}} */
@@ -1204,10 +1231,10 @@
PUTS(!sapi_module.phpinfo_as_text?"<br /><br />":"\n\n");
if (sapi_module.phpinfo_as_text) {
PUTS("Copyright (c) 2006-2007 Hardened-PHP Project\n");
- PUTS("Copyright (c) 2007-2008 SektionEins GmbH\n");
+ PUTS("Copyright (c) 2007-2012 SektionEins GmbH\n");
} else {
PUTS("Copyright (c) 2006-2007 <a href=\"http://www.hardened-php.net/\">Hardened-PHP Project</a><br />\n");
- PUTS("Copyright (c) 2007-2008 <a href=\"http://www.sektioneins.de/\">SektionEins GmbH</a>\n");
+ PUTS("Copyright (c) 2007-2012 <a href=\"http://www.sektioneins.de/\">SektionEins GmbH</a>\n");
}
php_info_print_box_end();
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/suhosin.ini
^
|
| @@ -134,7 +134,8 @@
; If you fear that Suhosin breaks your application, you can activate Suhosin's
; simulation mode with this flag. When Suhosin runs in simulation mode,
; violations are logged as usual, but nothing is blocked or removed from the
-; request. (Transparent Encryptions are NOT deactivated in simulation mode.)
+; request. (Transparent features are NOT deactivated in simulation mode.)
+; (since v0.9.30 affects (dis)allowed functions)
;suhosin.simulation = Off
; APC 3.0.12(p1/p2) uses reserved resources without requesting a resource slot
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/suhosin_rfc1867.h
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/treat_data.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
|
|
[-]
[+]
|
Changed |
suhosin-0.9.33.tgz/ufilter.c
^
|
| @@ -3,7 +3,7 @@
| Suhosin Version 1 |
+----------------------------------------------------------------------+
| Copyright (c) 2006-2007 The Hardened-PHP Project |
- | Copyright (c) 2007 SektionEins GmbH |
+ | Copyright (c) 2007-2012 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 |
|
