summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Auth/OpenID/Association.php2
-rw-r--r--Auth/OpenID/Consumer.php2
-rw-r--r--Auth/OpenID/DiffieHellman.php1
-rw-r--r--Auth/OpenID/DumbStore.php2
-rw-r--r--Auth/OpenID/FileStore.php2
-rw-r--r--Auth/OpenID/HMAC.php (renamed from Auth/OpenID/HMACSHA1.php)0
-rw-r--r--Tests/Auth/OpenID/Consumer.php1
-rw-r--r--Tests/Auth/OpenID/HMAC.php (renamed from Tests/Auth/OpenID/HMACSHA1.php)54
-rw-r--r--Tests/Auth/OpenID/Server.php1
-rw-r--r--Tests/Auth/OpenID/data/hmac-sha1.txt (renamed from Tests/Auth/OpenID/data/hmac.txt)0
-rw-r--r--Tests/TestDriver.php2
11 files changed, 36 insertions, 31 deletions
diff --git a/Auth/OpenID/Association.php b/Auth/OpenID/Association.php
index 602c20a..37ce0cb 100644
--- a/Auth/OpenID/Association.php
+++ b/Auth/OpenID/Association.php
@@ -27,7 +27,7 @@ require_once 'Auth/OpenID/KVForm.php';
/**
* @access private
*/
-require_once 'Auth/OpenID/HMACSHA1.php';
+require_once 'Auth/OpenID/HMAC.php';
/**
* This class represents an association between a server and a
diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index 0d41bed..0034c07 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -162,7 +162,7 @@
*/
require_once "Auth/OpenID.php";
require_once "Auth/OpenID/Message.php";
-require_once "Auth/OpenID/HMACSHA1.php";
+require_once "Auth/OpenID/HMAC.php";
require_once "Auth/OpenID/Association.php";
require_once "Auth/OpenID/CryptUtil.php";
require_once "Auth/OpenID/DiffieHellman.php";
diff --git a/Auth/OpenID/DiffieHellman.php b/Auth/OpenID/DiffieHellman.php
index 4af6629..f4ded7e 100644
--- a/Auth/OpenID/DiffieHellman.php
+++ b/Auth/OpenID/DiffieHellman.php
@@ -16,7 +16,6 @@
require_once 'Auth/OpenID.php';
require_once 'Auth/OpenID/BigMath.php';
-require_once 'Auth/OpenID/HMACSHA1.php';
function Auth_OpenID_getDefaultMod()
{
diff --git a/Auth/OpenID/DumbStore.php b/Auth/OpenID/DumbStore.php
index 96b3378..22fd2d3 100644
--- a/Auth/OpenID/DumbStore.php
+++ b/Auth/OpenID/DumbStore.php
@@ -18,7 +18,7 @@
* Import the interface for creating a new store class.
*/
require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/HMACSHA1.php';
+require_once 'Auth/OpenID/HMAC.php';
/**
* This is a store for use in the worst case, when you have no way of
diff --git a/Auth/OpenID/FileStore.php b/Auth/OpenID/FileStore.php
index 3fdd1dc..29d8d20 100644
--- a/Auth/OpenID/FileStore.php
+++ b/Auth/OpenID/FileStore.php
@@ -19,7 +19,7 @@
*/
require_once 'Auth/OpenID.php';
require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/HMACSHA1.php';
+require_once 'Auth/OpenID/HMAC.php';
require_once 'Auth/OpenID/Nonce.php';
/**
diff --git a/Auth/OpenID/HMACSHA1.php b/Auth/OpenID/HMAC.php
index 6e1cfb6..6e1cfb6 100644
--- a/Auth/OpenID/HMACSHA1.php
+++ b/Auth/OpenID/HMAC.php
diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index 82903d6..a762a9d 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -25,7 +25,6 @@ require_once 'Auth/OpenID/Server.php';
require_once 'Auth/OpenID/Nonce.php';
require_once 'Auth/OpenID/SReg.php';
require_once 'Auth/OpenID/Message.php';
-require_once 'Auth/OpenID/HMACSHA1.php';
require_once 'Tests/Auth/OpenID/MemStore.php';
require_once 'PHPUnit.php';
diff --git a/Tests/Auth/OpenID/HMACSHA1.php b/Tests/Auth/OpenID/HMAC.php
index 01fd58c..fde4102 100644
--- a/Tests/Auth/OpenID/HMACSHA1.php
+++ b/Tests/Auth/OpenID/HMAC.php
@@ -15,28 +15,29 @@
*/
require_once 'PHPUnit.php';
-require_once 'Auth/OpenID/HMACSHA1.php';
+require_once 'Auth/OpenID/HMAC.php';
require_once 'Tests/Auth/OpenID/TestUtil.php';
-class Tests_Auth_OpenID_HMACSHA1_TestCase extends PHPUnit_TestCase {
- function Tests_Auth_OpenID_HMACSHA1_TestCase(
- $name, $key, $data, $expected)
+class Tests_Auth_OpenID_HMAC_TestCase extends PHPUnit_TestCase {
+ function Tests_Auth_OpenID_HMAC_TestCase(
+ $name, $key, $data, $expected, $hmac_func)
{
$this->setName($name);
$this->key = $key;
$this->data = $data;
$this->expected = $expected;
+ $this->hmac_func = $hmac_func;
}
function runTest()
{
- $actual = Auth_OpenID_HMACSHA1($this->key, $this->data);
+ $actual = call_user_func($this->hmac_func, $this->key, $this->data);
$this->assertEquals($this->expected, $actual);
}
}
-class Tests_Auth_OpenID_HMACSHA1 extends PHPUnit_TestSuite {
+class Tests_Auth_OpenID_HMAC extends PHPUnit_TestSuite {
function _strConvert($s)
{
$repeat_pat = '/^0x([a-f0-9]{2}) repeated (\d+) times$/';
@@ -57,9 +58,9 @@ class Tests_Auth_OpenID_HMACSHA1 extends PHPUnit_TestSuite {
return $data;
}
- function _readTestCases()
+ function _readTestCases($test_file_name)
{
- $lines = Tests_Auth_OpenID_readlines('hmac.txt');
+ $lines = Tests_Auth_OpenID_readlines($test_file_name);
$cases = array();
$case = array();
foreach ($lines as $line) {
@@ -102,19 +103,19 @@ class Tests_Auth_OpenID_HMACSHA1 extends PHPUnit_TestSuite {
foreach ($cases as $case) {
$clean = array();
$clean["key"] =
- Tests_Auth_OpenID_HMACSHA1::_strConvert($case["key"]);
+ Tests_Auth_OpenID_HMAC::_strConvert($case["key"]);
if (Auth_OpenID::bytes($clean["key"]) != $case["key_len"]) {
trigger_error("Bad key length", E_USER_ERROR);
}
$clean["data"] =
- Tests_Auth_OpenID_HMACSHA1::_strConvert($case["data"]);
+ Tests_Auth_OpenID_HMAC::_strConvert($case["data"]);
if (Auth_OpenID::bytes($clean["data"]) != $case["data_len"]) {
trigger_error("Bad data length", E_USER_ERROR);
}
$clean["digest"] =
- Tests_Auth_OpenID_HMACSHA1::_strConvert($case["digest"]);
+ Tests_Auth_OpenID_HMAC::_strConvert($case["digest"]);
if (Auth_OpenID::bytes($clean["digest"]) != 20) {
$l = Auth_OpenID::bytes($clean["digest"]);
trigger_error("Bad digest length: $l", E_USER_ERROR);
@@ -127,22 +128,29 @@ class Tests_Auth_OpenID_HMACSHA1 extends PHPUnit_TestSuite {
return $final;
}
- function Tests_Auth_OpenID_HMACSHA1($name)
+ function Tests_Auth_OpenID_HMAC($name)
{
$this->setName($name);
- $cases = $this->_readTestCases();
- foreach ($cases as $case) {
- $test = new Tests_Auth_OpenID_HMACSHA1_TestCase(
- $case['test_case'],
- $case['key'],
- $case['data'],
- $case['digest']
- );
-
- $digest = $case['digest'];
- $this->addTest($test);
+ foreach (array('Auth_OpenID_HMACSHA1' => 'hmac-sha1.txt')
+ as $hash_func => $filename) {
+ $cases = $this->_readTestCases('hmac-sha1.txt');
+ foreach ($cases as $case) {
+ $test = new Tests_Auth_OpenID_HMAC_TestCase(
+ $case['test_case'],
+ $case['key'],
+ $case['data'],
+ $case['digest'],
+ $hash_func);
+
+ $digest = $case['digest'];
+ $this->_addTestByValue($test);
+ }
}
}
+
+ function _addTestByValue($test) {
+ $this->addTest($test);
+ }
}
?>
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index d73cb8b..7615ffc 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -9,7 +9,6 @@ require_once "Tests/Auth/OpenID/MemStore.php";
require_once "Auth/OpenID.php";
require_once "Auth/OpenID/DiffieHellman.php";
require_once "Auth/OpenID/Server.php";
-require_once "Auth/OpenID/HMACSHA1.php";
require_once "Auth/OpenID/Consumer.php";
function altModulus()
diff --git a/Tests/Auth/OpenID/data/hmac.txt b/Tests/Auth/OpenID/data/hmac-sha1.txt
index 4299a96..4299a96 100644
--- a/Tests/Auth/OpenID/data/hmac.txt
+++ b/Tests/Auth/OpenID/data/hmac-sha1.txt
diff --git a/Tests/TestDriver.php b/Tests/TestDriver.php
index 71652dd..a19b502 100644
--- a/Tests/TestDriver.php
+++ b/Tests/TestDriver.php
@@ -134,7 +134,7 @@ $_tests = array(
'DiffieHellman',
'Discover_OpenID',
'Extension',
- 'HMACSHA1',
+ 'HMAC',
'KVForm',
'Message',
'Negotiation',
generated by cgit v1.1 at 2025-05-11 22:44:51 +0000