From 6c0ef58d50546a08844c9cbd312117a53cb86b79 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:13:13 +0200
Subject: [PATCH] Revert "Use hex instead of base64, add also the original
ciphertext."
This reverts commit c441f9c92d30078f047037f6f8067e196c7ea76f.
---
lib/SimpleSAML/Utils/Crypto.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index 14cfeec0f..480d3a6eb 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -53,8 +53,8 @@ class Crypto
}
}
- throw new \SimpleSAML_Error_Exception("Failed to decrypt ciphertext \"".bin2hex($ciphertext).
- '", hmac: "'.bin2hex($hmac).'", iv: "'.bin2hex($iv).'", msg: "'.bin2hex($msg).'"');
+ throw new \SimpleSAML_Error_Exception("Failed to decrypt ciphertext \"".
+ base64_encode($ciphertext).'", hmac: "'.base64_encode($hmac).'", iv: "'.base64_encode($iv).'"');
}
--
GitLab