Revision: 3193
Author: jaim...@gmail.com
Date: Wed Oct 17 08:53:41 2012
Log: Fixes for compatibility with PHP 5.4.
http://code.google.com/p/simplesamlphp/source/detail?r=3193
Modified:
/trunk/modules/InfoCard/lib/STS.php
/trunk/modules/expirycheck/lib/Auth/Process/ExpiryDate.php
/trunk/modules/oauth/bin/demo.php
=======================================
--- /trunk/modules/InfoCard/lib/STS.php Mon Feb 6 23:43:21 2012
+++ /trunk/modules/InfoCard/lib/STS.php Wed Oct 17 08:53:41 2012
@@ -360,7 +360,7 @@
$canonicalbuf =
sspmod_InfoCard_Utils::canonicalize($signedinfo);
$privkey =
openssl_pkey_get_private(file_get_contents($config['sts_key']));
$signature = '';
- openssl_sign($canonicalbuf, &$signature, $privkey);
+ openssl_sign($canonicalbuf, $signature, $privkey);
openssl_free_key($privkey);
$samlsignature = base64_encode($signature);
=======================================
--- /trunk/modules/expirycheck/lib/Auth/Process/ExpiryDate.php Tue Nov 8
00:30:30 2011
+++ /trunk/modules/expirycheck/lib/Auth/Process/ExpiryDate.php Wed Oct 17
08:53:41 2012
@@ -121,7 +121,7 @@
$netId = $state['Attributes'][$this->netid_attr][0];
$expireOnDate =
strtotime($state['Attributes'][$this->expirydate_attr][0]);
- if (self::shWarning(&$state, $expireOnDate,
$this->warndaysbefore)) {
+ if (self::shWarning($state, $expireOnDate,
$this->warndaysbefore)) {
assert('is_array($state)');
if (isset($state['isPassive']) && $state['isPassive']
=== TRUE) {
/* We have a passive request. Skip the warning.
*/
=======================================
--- /trunk/modules/oauth/bin/demo.php Fri Jul 22 02:10:17 2011
+++ /trunk/modules/oauth/bin/demo.php Wed Oct 17 08:53:41 2012
@@ -2,7 +2,7 @@
<?php
-function readline($prompt = '') {
+function _readline($prompt = '') {
echo $prompt;
return rtrim( fgets( STDIN ), "\n" );
}
@@ -40,7 +40,7 @@
echo('Go to this URL to authenticate/authorize the request: ' .
$url . "\n");
system('open ' . $url);
- readline('Click enter when you have completed the authorization step
using your web browser...');
+ _readline('Click enter when you have completed the authorization step
using your web browser...');
// Replace the request token with an access token
$accessToken = $consumer->getAccessToken(
$baseurl . '/module.php/oauth/accessToken.php', $requestToken);
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to simplesamlphp-commits@googlegroups.com.
To unsubscribe from this group, send email to
simplesamlphp-commits+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en.
