Ignore this patch please, it was accidentally sent out. Thx!
On Wed, Feb 19, 2014 at 5:46 PM, Helga Velroyen <[email protected]> wrote: > Signed-off-by: Helga Velroyen <[email protected]> > --- > lib/rpc/node.py | 14 ++++++++++++++ > lib/server/noded.py | 1 + > 2 files changed, 15 insertions(+) > > diff --git a/lib/rpc/node.py b/lib/rpc/node.py > index 8c0f822..0379c01 100644 > --- a/lib/rpc/node.py > +++ b/lib/rpc/node.py > @@ -106,6 +106,20 @@ def _ConfigRpcCurl(curl): > logging.info("Using server certificate as client certificate for RPC" > "call.") > noded_client_cert = noded_cert > + > + > + logging.error("XXX ca_info %s" % noded_cert) > + logging.error("XXX client cert %s" % noded_client_cert) > + > + ca = open(noded_cert, 'r') > + ca_content = "".join(ca.readlines()) > + logging.error("XXX ca_info content %s" % ca_content) > + ca.close() > + > + cert = open(noded_client_cert, 'r') > + cert_content = "".join(cert.readlines()) > + logging.error("XXX cert_info content %s" % cert_content) > + cert.close() > > curl.setopt(pycurl.FOLLOWLOCATION, False) > curl.setopt(pycurl.CAINFO, noded_cert) > diff --git a/lib/server/noded.py b/lib/server/noded.py > index 9731925..719f010 100644 > --- a/lib/server/noded.py > +++ b/lib/server/noded.py > @@ -1225,6 +1225,7 @@ def SSLVerifyPeer(conn, cert, errnum, errdepth, ok): > candidate_certs = { > _BOOTSTRAP: utils.GetCertificateDigest( > cert_filename=pathutils.NODED_CERT_FILE)} > + logging.error("XXX candidate certs %s" % candidate_certs) > return cert.digest("sha1") in candidate_certs.values() > # pylint: enable=W0613 > > -- > 1.9.0.rc1.175.g0b1dcb5 > > -- -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
