From 1a3fd5eeb9a5859aefedb9302adb6ecd6a1873a7 Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Wed, 12 Oct 2016 14:57:47 +0200 Subject: comments and whitespace cleanup --- cookiecrypt.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'cookiecrypt.c') diff --git a/cookiecrypt.c b/cookiecrypt.c index f4f3638..42169f8 100644 --- a/cookiecrypt.c +++ b/cookiecrypt.c @@ -17,9 +17,6 @@ | Ben Fuhrmannek | +----------------------------------------------------------------------+ */ -/* - $Id: header.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ -*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,11 +32,11 @@ zend_string *suhosin_encrypt_single_cookie(char *name, int name_len, char *value { int l; - name = estrndup(name, name_len); + name = estrndup(name, name_len); name_len = php_url_decode(name, name_len); suhosin_normalize_varname(name); name_len = strlen(name); - + if ((SUHOSIN7_G(cookie_plainlist) && zend_hash_str_exists(SUHOSIN7_G(cookie_plainlist), name, name_len)) || (SUHOSIN7_G(cookie_plainlist) == NULL && SUHOSIN7_G(cookie_cryptlist) && !zend_hash_str_exists(SUHOSIN7_G(cookie_cryptlist), name, name_len))) { efree(name); @@ -48,7 +45,7 @@ zend_string *suhosin_encrypt_single_cookie(char *name, int name_len, char *value value = estrndup(value, value_len); value_len = php_url_decode(value, value_len); - + zend_string *d = suhosin_encrypt_string(value, value_len, name, name_len, key); zend_string *d_url = php_url_encode(ZSTR_VAL(d), ZSTR_LEN(d)); zend_string_release(d); @@ -63,7 +60,7 @@ char *suhosin_decrypt_single_cookie(char *name, int name_len, char *value, int v int name2_len = php_url_decode(name2, name_len); suhosin_normalize_varname(name2); name2_len = strlen(name2); - + if ((SUHOSIN7_G(cookie_plainlist) && zend_hash_str_exists(SUHOSIN7_G(cookie_plainlist), name2, name2_len)) || (SUHOSIN7_G(cookie_plainlist) == NULL && SUHOSIN7_G(cookie_cryptlist) && !zend_hash_str_exists(SUHOSIN7_G(cookie_cryptlist), name2, name2_len))) { // if (1) { @@ -75,10 +72,10 @@ char *suhosin_decrypt_single_cookie(char *name, int name_len, char *value, int v *out += value_len; return *out; } - + value = estrndup(value, value_len); value_len = php_url_decode(value, value_len); - + zend_string *d = suhosin_decrypt_string(value, value_len, name2, name2_len, key, SUHOSIN7_G(cookie_checkraddr)); if (d) { zend_string *d_url = php_url_encode(ZSTR_VAL(d), ZSTR_LEN(d)); @@ -93,7 +90,7 @@ char *suhosin_decrypt_single_cookie(char *name, int name_len, char *value, int v efree(name2); efree(value); - + return *out; } @@ -109,7 +106,7 @@ char *suhosin_cookie_decryptor(char *raw_cookie) // suhosin_generate_key(SUHOSIN7_G(cookie_cryptkey), SUHOSIN7_G(cookie_cryptua), SUHOSIN7_G(cookie_cryptdocroot), SUHOSIN7_G(cookie_cryptraddr), cryptkey); S7_GENERATE_KEY(cookie, cryptkey); // SDEBUG("cryptkey=%02x.%02x.%02x", cryptkey[0], cryptkey[1], cryptkey[2]); - + ret = decrypted = emalloc(strlen(raw_cookie)*4+1); raw_cookie = estrdup(raw_cookie); SUHOSIN7_G(raw_cookie) = estrdup(raw_cookie); @@ -138,10 +135,10 @@ char *suhosin_cookie_decryptor(char *raw_cookie) *decrypted++ = 0; ret = erealloc(ret, decrypted-ret); - + SUHOSIN7_G(decrypted_cookie) = ret; efree(raw_cookie); - + return ret; } /* }}} */ -- cgit v1.3