##// END OF EJS Templates
sslutil: use a dict for hanging hg state off the wrapped socket...
Gregory Szorc -
r29225:b115eed1 default
parent child Browse files
Show More
@@ -171,7 +171,9 b' def wrapsocket(sock, keyfile, certfile, '
171 if not sslsocket.cipher():
171 if not sslsocket.cipher():
172 raise error.Abort(_('ssl connection failed'))
172 raise error.Abort(_('ssl connection failed'))
173
173
174 sslsocket._hgcaloaded = caloaded
174 sslsocket._hgstate = {
175 'caloaded': caloaded,
176 }
175
177
176 return sslsocket
178 return sslsocket
177
179
@@ -341,7 +343,7 b' class validator(object):'
341 (host, nicefingerprint))
343 (host, nicefingerprint))
342 return
344 return
343
345
344 if not sock._hgcaloaded:
346 if not sock._hgstate['caloaded']:
345 if strict:
347 if strict:
346 raise error.Abort(_('%s certificate with fingerprint %s not '
348 raise error.Abort(_('%s certificate with fingerprint %s not '
347 'verified') % (host, nicefingerprint),
349 'verified') % (host, nicefingerprint),
General Comments 0
You need to be logged in to leave comments. Login now