pythonmobile
diff --git a/‎openid/consumer/consumer.py‎
Lines changed: 11 additions & 8 deletions b/‎openid/consumer/consumer.py‎
Lines changed: 11 additions & 8 deletions
diff --git a/‎openid/oidutil.py‎
Lines changed: 0 additions & 9 deletions b/‎openid/oidutil.py‎
Lines changed: 0 additions & 9 deletions
@@ -584,22 +584,17 @@ def _doIdRes(self, token, query):
             assoc.expiresIn <= 0):
             # It's not an association we know about.  Dumb mode is our
             # only possible path for recovery.
-            check_args = oidutil.getOpenIDParameters(query)
-            check_args['openid.mode'] = 'check_authentication'
-            post_data = urllib.urlencode(check_args)
-
             return self._checkAuth(
-                nonce, consumer_id, post_data, server_url)
+                nonce, consumer_id, query, server_url)
 
         # Check the signature
         sig = query.get('openid.sig')
         signed = query.get('openid.signed')
         if sig is None or signed is None:
             return FAILURE, consumer_id
 
-        args = oidutil.getOpenIDParameters(query)
         signed_list = signed.split(',')
-        v_sig = assoc.signDict(signed_list, args)
+        v_sig = assoc.signDict(signed_list, query)
 
         if v_sig != sig:
             return FAILURE, consumer_id
@@ -609,7 +604,15 @@ def _doIdRes(self, token, query):
 
         return SUCCESS, consumer_id
 
-    def _checkAuth(self, nonce, consumer_id, post_data, server_url):
+    def _checkAuth(self, nonce, consumer_id, query, server_url):
+        # XXX: send only those arguments that were signed?
+        check_args = {}
+        for k, v in query.iteritems():
+            if k.startswith('openid.'):
+                check_args[k] = v
+        check_args['openid.mode'] = 'check_authentication'
+        post_data = urllib.urlencode(check_args)
+
         ret = self.fetcher.post(server_url, post_data)
         if ret is None:
             return FAILURE, consumer_id
 
@@ -31,15 +31,6 @@ def fromBase64(s):
     except binascii.Error:
         return ''
 
-
-def getOpenIDParameters(query):
-    params = {}
-    for k, v in query.iteritems():
-        if k.startswith('openid.'):
-            params[k] = v
-    return params
-
-
 def quoteMinimal(s):
     """Turn a str or unicode object into an ASCII string