git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ae7afbf
)
remove unnecessary code
author
Tony Mack
<tmack@cs.princeton.edu>
Fri, 5 Mar 2010 20:08:07 +0000
(20:08 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Fri, 5 Mar 2010 20:08:07 +0000
(20:08 +0000)
sfa/trust/auth.py
patch
|
blob
|
history
diff --git
a/sfa/trust/auth.py
b/sfa/trust/auth.py
index
6688767
..
3bcc097
100644
(file)
--- 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
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()
def verifyGidRequestHash(self, gid, hash, arglist):
key = gid.get_pubkey()