> > > curl.setopt(pycurl.FOLLOWLOCATION, False) > > > - curl.setopt(pycurl.CAINFO, noded_cert) > > > curl.setopt(pycurl.SSL_VERIFYHOST, 0) > > > curl.setopt(pycurl.SSL_VERIFYPEER, True) > > > curl.setopt(pycurl.SSLCERTTYPE, "PEM") > > > curl.setopt(pycurl.SSLCERT, noded_client_cert) > > > curl.setopt(pycurl.SSLKEYTYPE, "PEM") > > > curl.setopt(pycurl.SSLKEY, noded_client_cert) > > > + curl.setopt(pycurl.CAINFO, noded_cert) > > > curl.setopt(pycurl.CONNECTTIMEOUT, constants.RPC_CONNECT_TIMEOUT) > > > > Do curl options not commute? If so, please comment on why. > > Otherwise, what tis the reason to move that line unchanged > > to a different place? > > > > Actually, they do. This was left over from various debugging sessions (it > would not be the first bug like that to be found). So here's the interdiff > it put it back where it was: > > diff --git a/lib/rpc/node.py b/lib/rpc/node.py > index fd6ecef..e5d77cf 100644 > --- a/lib/rpc/node.py > +++ b/lib/rpc/node.py > @@ -117,13 +117,13 @@ def _ConfigRpcCurl(curl): > noded_client_cert = noded_cert > > curl.setopt(pycurl.FOLLOWLOCATION, False) > + curl.setopt(pycurl.CAINFO, noded_cert) > curl.setopt(pycurl.SSL_VERIFYHOST, 0) > curl.setopt(pycurl.SSL_VERIFYPEER, True) > curl.setopt(pycurl.SSLCERTTYPE, "PEM") > curl.setopt(pycurl.SSLCERT, noded_client_cert) > curl.setopt(pycurl.SSLKEYTYPE, "PEM") > curl.setopt(pycurl.SSLKEY, noded_client_cert) > - curl.setopt(pycurl.CAINFO, noded_cert) > curl.setopt(pycurl.CONNECTTIMEOUT, constants.RPC_CONNECT_TIMEOUT) >
LGTM to the patch with the interdiff. -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
