[project @ Diffie-Hellman associate error test and fixes]

2 files changed, 10 insertions, 1 deletions

diff --git a/Auth/OpenID/DiffieHellman.php b/Auth/OpenID/DiffieHellman.php
index 20c0827..82208bb 100644
--- a/Auth/OpenID/DiffieHellman.php
+++ b/Auth/OpenID/DiffieHellman.php
@@ -123,7 +123,7 @@ class Auth_OpenID_DiffieHellman {
             $gen = null;
         }
         
-        $cpub64 = $consumer_args['openid.dh_consumer_public'];
+        $cpub64 = @$consumer_args['openid.dh_consumer_public'];
         if (!isset($cpub64)) {
             return false;
         }
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index 4f57f9b..9426fc4 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -139,4 +139,13 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestCase {
         $this->assertEquals('string', gettype($secret));
         $this->assertTrue(strlen($secret) > 0);
     }
+
+    function test_associateDHnoKey()
+    {
+        $args = array('openid.session_type' => 'DH-SHA1');
+        list($status, $info) = $this->server->associate($args);
+        $this->assertEquals(Auth_OpenID_REMOTE_ERROR, $status);
+        $ra = Auth_OpenID_KVForm::kvToArray($info);
+        $this->assertKeyExists('error', $ra);
+    }
 }