From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 5 Mar 2010 20:08:07 +0000 (+0000)
Subject: remove unnecessary code
X-Git-Tag: sfa-0.9-11~52
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=127447d17ad02230d235ee2e3fddcfdc4311db23

remove unnecessary code
---

diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py
index 66887670..3bcc0971 100644
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@ -80,17 +80,8 @@ class Auth:
 
     def verifyPeerCert(self, cert, gid):
         # make sure the client_gid matches client's certificate
-        if not cert:
-            peer_cert = self.peer_cert
-        else:
-            peer_cert = cert
-
-        if not gid:
-            peer_gid = self.client_gid
-        else:
-            peer_gid = gid
-        if not peer_cert.is_pubkey(peer_gid.get_pubkey()):
-            raise ConnectionKeyGIDMismatch(peer_gid.get_subject())            
+        if not cert.is_pubkey(gid.get_pubkey()):
+            raise ConnectionKeyGIDMismatch(gid.get_subject()+":"+cert.get_subject())            
 
     def verifyGidRequestHash(self, gid, hash, arglist):
         key = gid.get_pubkey()