X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=blobdiff_plain;f=source%2FBootServerRequest.py;h=1c2dad5934a1bf8031e913bce3528c071d42dcba;hp=7b6531da33549dc6b147f10bf92045c3cd866c85;hb=1e11592251ab599965bb7dc88b631d14e9be1a60;hpb=d531cfaf5185ca1e74a5f15c2e3b1254968200de diff --git a/source/BootServerRequest.py b/source/BootServerRequest.py index 7b6531d..1c2dad5 100644 --- a/source/BootServerRequest.py +++ b/source/BootServerRequest.py @@ -32,8 +32,6 @@ except: class BootServerRequest: - VERBOSE = 0 - # all possible places to check the cdrom mount point. # /mnt/cdrom is typically after the machine has come up, # and /usr is when the boot cd is running @@ -55,7 +53,14 @@ class BootServerRequest: # really need for the boot cd environment where pycurl # doesn't exist CURL_CMD = 'curl' - CURL_SSL_VERSION = 3 + + # use TLSv1 and not SSLv3 anymore + if PYCURL_LOADED: + CURL_SSL_VERSION = pycurl.SSLVERSION_TLSv1 + else: + # used to be '3' for SSLv3 + # xxx really not sure what this means when pycurl is not loaded + CURL_SSL_VERSION = 1 def __init__(self, vars, verbose=0):