From 98905cc3f17e447e62a852073f7115cd0746ba0f Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Tue, 21 Jul 2015 13:57:43 +0200
Subject: [PATCH] SimpleSAMLphp no longer requires mcrypt, it will only be
needed depending on the configuration, so mark it as optional.
---
docs/simplesamlphp-install.txt | 3 ++-
modules/core/www/frontpage_config.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/simplesamlphp-install.txt b/docs/simplesamlphp-install.txt
index 76a5fb4d8..914967364 100644
--- a/docs/simplesamlphp-install.txt
+++ b/docs/simplesamlphp-install.txt
@@ -34,7 +34,8 @@ Prerequisites
* Some webserver capable of executing PHP scripts.
* PHP version >= 5.3.0.
* Support for the following PHP extensions:
- * Always required: `date`, `dom`, `hash`, `libxml`, `openssl`, `pcre`, `SPL`, `zlib`, `mcrypt`
+ * Always required: `date`, `dom`, `hash`, `libxml`, `openssl`, `pcre`, `SPL`, `zlib`
+ * When using encryption or digital signatures: `mcrypt`
* When authenticating against LDAP server: `ldap`
* When authenticating against RADIUS server: `radius`
* When saving session information to memcache-server: `memcache`
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 74c8c61fa..d04beaf60 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -85,7 +85,7 @@ $functionchecks = array(
'simplexml_import_dom' => array('required', 'SimpleXML'),
'dom_import_simplexml' => array('required', 'XML DOM'),
'preg_match' => array('required', 'RegEx support'),
- 'mcrypt_module_open'=> array('required', 'MCrypt'),
+ 'mcrypt_module_open'=> array('optional', 'MCrypt'),
'mysql_connect' => array('optional', 'MySQL support'),
);
if (SimpleSAML_Module::isModuleEnabled('ldap')) {
--
GitLab