Fix to allow falling back on OpenSSL implementation if pyOpenSSL is t…

…oo old
zeroc-ice · Jun 3, 2015 · cea4dae · cea4dae
1 parent 53b42cf
commit cea4dae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/IceCertUtils/CertificateUtils.py b/IceCertUtils/CertificateUtils.py
@@ -55,7 +55,9 @@ def write(p, data):
 pyopensslSupport = False
 try:
     import OpenSSL
-    pyopensslSupport = True
+    v = re.match(r"([0-9]+)\.([0-9]+)", OpenSSL.__version__)
+    # Require pyOpenSSL >= 0.13
+    pyopensslSupport = (int(v.group(1)) * 100 + int(v.group(2))) >= 13
 except:
     pass
 
@@ -267,6 +269,10 @@ def consume(kargs, keys):
             elif k.lower() in kargs:
                 args[k] = kargs[k.lower()]
                 del kargs[k.lower()]
+
+            if k in args and args[k] is None:
+                del args[k]
+
         return (kargs, args)
 
     if not altName:

diff --git a/IceCertUtils/IceCaUtil.py b/IceCertUtils/IceCaUtil.py
@@ -154,7 +154,7 @@ def create(script, factory):
 
    alias = args[0]
    commonName = len(args) == 2 and args[1] or alias
-   cert = factory().create(alias, dn=commonName, ip=opts.get("ip", None), dns=opts.get("dns", None))
+   cert = factory().create(alias, cn=commonName, ip=opts.get("ip", None), dns=opts.get("dns", None))
    print("Created `%s' certificate `%s'" % (alias, str(cert)))
 
 def export(script, factory):