External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Fix mistaken order of server cert/key parameters in constructor

Browse Source 
The virNetTLSContextNew was being passed key/cert parameters in
the wrong order. This wasn't immediately visible because if
virNetTLSContextNewPath was used, a second bug reversed the order
of those parameters again.

Only if the paths were manually specified in /etc/libvirt/libvirtd.conf
did the bug appear

* src/rpc/virnettlscontext.c: Fix order of params passed to
  virNetTLSContextNew
This commit is contained in:
Daniel P. Berrange 2011-07-08 11:14:20 +01:00
parent 30c43afd73
commit c2ddd53614
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/virnettlscontext.c
View File

@ -396,10 +396,10 @@ static virNetTLSContextPtr virNetTLSContextNewPath(const char *pkipath,
virNetTLSContextPtr ctxt = NULL; virNetTLSContextPtr ctxt = NULL;
if (virNetTLSContextLocateCredentials(pkipath, tryUserPkiPath, isServer, if (virNetTLSContextLocateCredentials(pkipath, tryUserPkiPath, isServer,
&cacert, &cacrl, &key, &cert) < 0) &cacert, &cacrl, &cert, &key) < 0)
return NULL; return NULL;
ctxt = virNetTLSContextNew(cacert, cacrl, key, cert, ctxt = virNetTLSContextNew(cacert, cacrl, cert, key,
x509dnWhitelist, requireValidCert, isServer); x509dnWhitelist, requireValidCert, isServer);
VIR_FREE(cacert); VIR_FREE(cacert);
@ -435,7 +435,7 @@ virNetTLSContextPtr virNetTLSContextNewServer(const char *cacert,
const char *const*x509dnWhitelist, const char *const*x509dnWhitelist,
bool requireValidCert) bool requireValidCert)
{ {
return virNetTLSContextNew(cacert, cacrl, key, cert, return virNetTLSContextNew(cacert, cacrl, cert, key,
x509dnWhitelist, requireValidCert, true); x509dnWhitelist, requireValidCert, true);
} }