From 47fb73801bdbfbb12841c2ac6fa13235d98dc197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Wed, 26 Apr 2017 14:09:36 +0200
Subject: [PATCH] Try to fix build.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It looks like mb_substr() doesn’t cope well with NULL as the third parameter in PHP 5.3.
---
lib/SimpleSAML/Utils/Crypto.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index 17dcd81f6..14cfeec0f 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -36,7 +36,7 @@ class Crypto
$hmac = mb_substr($ciphertext, 0, 32, '8bit');
$iv = mb_substr($ciphertext, 32, 16, '8bit');
- $msg = mb_substr($ciphertext, 48, null, '8bit');
+ $msg = mb_substr($ciphertext, 48, mb_strlen($ciphertext) - 48, '8bit');
// authenticate the ciphertext
if (self::secureCompare(hash_hmac('sha256', $iv.$msg, substr($key, 64, 64), true), $hmac)) {
--
GitLab