From 54c352c1b5aa08b187dd1e52e544709cad2b0fee Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Thu, 23 Sep 2021 12:23:40 +0200
Subject: config is stack allocated now + some code improvements (see details)

* for easier memory manegement, the entire sp_config struct was merged into snuffleupagus_globals and allocated on stack where possible
* SNUFFLEUPAGUS_G() can be written as SPG(), which is faster to type and easier to read
* execution_depth is re-initialized to 0 for each request
* function calls with inline string and length parameters consistently use ZEND_STRL instead of sizeof()-1
* execution is actually hooked if recursion protection is enabled
* some line breaks were removed to make the code more readable
---
 src/sp_crypt.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/sp_crypt.c')

diff --git a/src/sp_crypt.c b/src/sp_crypt.c
index ff8f65e..c1d9403 100644
--- a/src/sp_crypt.c
+++ b/src/sp_crypt.c
@@ -3,13 +3,10 @@
 void generate_key(unsigned char *key) {
   PHP_SHA256_CTX ctx;
   const char *user_agent = getenv("HTTP_USER_AGENT");
-  const zend_string *env_var_zend =
-      SNUFFLEUPAGUS_G(config).config_snuffleupagus->cookies_env_var;
-  const zend_string *encryption_key_zend =
-      SNUFFLEUPAGUS_G(config).config_snuffleupagus->encryption_key;
+  const zend_string *env_var_zend = SPCFG(cookies_env_var);
+  const zend_string *encryption_key_zend = SPCFG(encryption_key);
   const char *env_var = (env_var_zend ? getenv(ZSTR_VAL(env_var_zend)) : NULL);
-  const char *encryption_key =
-      (encryption_key_zend ? ZSTR_VAL(encryption_key_zend) : NULL);
+  const char *encryption_key = (encryption_key_zend ? ZSTR_VAL(encryption_key_zend) : NULL);
 
   assert(32 == crypto_secretbox_KEYBYTES);  // 32 is the size of a SHA256.
   assert(encryption_key);                   // Encryption key can't be NULL
-- 
cgit v1.3