External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: allow TLS priority to be customized

Browse Source 
Support reading the TLS priority from the client configuration
file via the "tls_priority" config option, eg

 $ cat $HOME/.config/libvirt/libvirt.conf
 tls_priority="NORMAL:-VERS-SSL3.0"

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-06-03 18:20:27 +01:00
parent 5f1837eaca
commit 6d310c9cff
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/remote/remote_driver.c
View File

@ -638,6 +638,7 @@ static int
doRemoteOpen(virConnectPtr conn, doRemoteOpen(virConnectPtr conn,
struct private_data *priv, struct private_data *priv,
virConnectAuthPtr auth ATTRIBUTE_UNUSED, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
virConfPtr conf,
unsigned int flags) unsigned int flags)
{ {
char *transport_str = NULL; char *transport_str = NULL;
@ -844,6 +845,19 @@ doRemoteOpen(virConnectPtr conn,
/* Connect to the remote service. */ /* Connect to the remote service. */
switch (transport) { switch (transport) {
case trans_tls: case trans_tls:
if (conf && !tls_priority) {
virConfValuePtr val = virConfGetValue(conf, "tls_priority");
if (val) {
if (val->type != VIR_CONF_STRING) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("Config file 'tls_priority' must be a string"));
goto failed;
}
if (VIR_STRDUP(tls_priority, val->str) < 0)
goto failed;
}
}
#ifdef WITH_GNUTLS #ifdef WITH_GNUTLS
priv->tls = virNetTLSContextNewClientPath(pkipath, priv->tls = virNetTLSContextNewClientPath(pkipath,
geteuid() != 0 ? true : false, geteuid() != 0 ? true : false,
@ -1180,7 +1194,7 @@ remoteAllocPrivateData(void)
static virDrvOpenStatus static virDrvOpenStatus
remoteConnectOpen(virConnectPtr conn, remoteConnectOpen(virConnectPtr conn,
virConnectAuthPtr auth, virConnectAuthPtr auth,
virConfPtr conf ATTRIBUTE_UNUSED, virConfPtr conf,
unsigned int flags) unsigned int flags)
{ {
struct private_data *priv; struct private_data *priv;
@ -1239,7 +1253,7 @@ remoteConnectOpen(virConnectPtr conn,
#endif #endif
} }
ret = doRemoteOpen(conn, priv, auth, rflags); ret = doRemoteOpen(conn, priv, auth, conf, rflags);
if (ret != VIR_DRV_OPEN_SUCCESS) { if (ret != VIR_DRV_OPEN_SUCCESS) {
conn->privateData = NULL; conn->privateData = NULL;
remoteDriverUnlock(priv); remoteDriverUnlock(priv);