From e602fd738f066e0abf9fdf8b5dbb373b8daee40b Mon Sep 17 00:00:00 2001
From: Stefan Esser
Date: Wed, 11 Jan 2012 20:14:17 +0100
Subject: Removed crypt() support

---
 Changelog     | 4 ++++
 config.m4     | 2 +-
 config.w32    | 5 +----
 php_suhosin.h | 3 +--
 suhosin.c     | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Changelog b/Changelog
index aeecfe4..a1f6231 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+2012-01-11 - 0.9.33-dev
+
+    - 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
diff --git a/config.m4 b/config.m4
index d5e52e2..2a756e3 100644
--- a/config.m4
+++ b/config.m4
@@ -5,5 +5,5 @@ PHP_ARG_ENABLE(suhosin, whether to enable suhosin support,
 [  --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
diff --git a/config.w32 b/config.w32
index bd0e169..9fc8d41 100644
--- a/config.w32
+++ b/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");
 }
diff --git a/php_suhosin.h b/php_suhosin.h
index 312bb08..071d57f 100644
--- a/php_suhosin.h
+++ b/php_suhosin.h
@@ -22,7 +22,7 @@
 #ifndef PHP_SUHOSIN_H
 #define PHP_SUHOSIN_H
 
-#define SUHOSIN_EXT_VERSION  "0.9.32.1"
+#define SUHOSIN_EXT_VERSION  "0.9.33-dev"
 
 /*#define SUHOSIN_DEBUG*/
 #define SUHOSIN_LOG "/tmp/suhosin_log.txt"
@@ -312,7 +312,6 @@ 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();
diff --git a/suhosin.c b/suhosin.c
index 22c9ddf..39fa186 100644
--- a/suhosin.c
+++ b/suhosin.c
@@ -1068,7 +1068,6 @@ PHP_MINIT_FUNCTION(suhosin)
 
 	/* now hook a bunch of stuff */
 	suhosin_hook_memory_limit();
-	suhosin_hook_crypt();
 	suhosin_hook_sha256();
 	suhosin_hook_ex_imp();
 
-- 
cgit v1.3