Ubuntu package updates

3 files changed, 0 insertions, 197 deletions

diff --git a/cpp/config/Makefile b/cpp/config/Makefile
index 68fa79d7b2f..c0f0538a4bd 100644
--- a/cpp/config/Makefile
+++ b/cpp/config/Makefile
@@ -16,7 +16,6 @@ all::
 
 install::
 	$(call installdata,templates.xml,$(DESTDIR)$(install_configdir))
-	$(call installdata,convertssl.py,$(DESTDIR)$(install_configdir))
 	$(call installdata,upgradeicegrid33.py,$(DESTDIR)$(install_configdir))
 	$(call installdata,upgradeicegrid35.py,$(DESTDIR)$(install_configdir))
 	$(call installdata,icegrid-slice.3.1.ice.gz,$(DESTDIR)$(install_configdir))
diff --git a/cpp/config/Makefile.mak b/cpp/config/Makefile.mak
index 5c30b3943fc..55701ceb34b 100644
--- a/cpp/config/Makefile.mak
+++ b/cpp/config/Makefile.mak
@@ -13,7 +13,6 @@ top_srcdir	= ..
 
 install::
 	copy templates.xml "$(install_configdir)"
-	copy convertssl.py "$(install_configdir)"
 	copy upgradeicegrid33.py "$(install_configdir)"
 	copy upgradeicegrid35.py "$(install_configdir)"
 	copy icegridregistry.cfg "$(install_configdir)"
diff --git a/cpp/config/convertssl.py b/cpp/config/convertssl.py
deleted file mode 100755
index 0bc6ddb9f94..00000000000
--- a/cpp/config/convertssl.py
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-#
-# This script converts an XML configuration file for earlier versions of
-# the IceSSL plug-in to the new property format in 3.1.
-#
-# Usage:
-#
-# python convertssl.py myconfig.xml
-#
-# The equivalent properties are printed to standard output. If any
-# compatibility issues are detected, a NOTE comment is emitted.
-#
-
-import sys, xml.dom, xml.dom.minidom
-
-#
-# Show usage information.
-#
-def usage():
-    print("Usage: " + sys.argv[0] + " xmlfile")
-    print("")
-    print("Options:")
-    print("-h    Show this message.")
-
-def isCygwin():
-    # The substring on sys.platform is required because some cygwin
-    # versions return variations like "cygwin_nt-4.01".
-    return sys.platform[:6] == "cygwin"
-
-def isWin32():
-    return sys.platform == "win32" or isCygwin()
-
-if isWin32():
-    sep = ";"
-else:
-    sep = ":"
-
-def findChild(parent, name):
-    for i in parent.childNodes:
-        if i.localName == name:
-            return i
-    return None
-
-def printConfig(node, name, comment=""):
-    prefix = comment + "IceSSL."
-    result = "# These properties were converted from the " + name + " configuration.\n"
-    result = result + "#\n# NOTE: You may need to define IceSSL.DefaultDir\n"
-    general = findChild(node, "general")
-    if general:
-        if "version" in general.attributes:
-            version = general.attributes["version"].nodeValue
-            if version == "SSLv3":
-                result = result + prefix + "Protocols=SSLv3\n"
-            elif version == "TLSv1":
-                result = result + prefix + "Protocols=TLSv1\n"
-            elif version != "SSLv23":
-                print("unknown value `" + version + "' for version attribute")
-                sys.exit(1)
-
-        if "cipherlist" in general.attributes:
-            result = result + prefix + "Ciphers=" + general.attributes["cipherlist"].nodeValue + "\n"
-
-        if "verifymode" in general.attributes:
-            verifymode = general.attributes["verifymode"].nodeValue
-            if verifymode == "none":
-                result = result + prefix + "VerifyPeer=0\n"
-            elif verifymode == "peer":
-                result = result + prefix + "VerifyPeer=1\n"
-            elif verifymode.find("fail") != -1:
-                result = result + prefix + "VerifyPeer=2\n"
-            elif verifymode.find("client_once") != -1:
-                result = result + prefix + "VerifyPeer=2\n"
-            else:
-                print("unknown value `" + verifymode + "' for verifymode attribute")
-                sys.exit(1)
-
-        if "verifydepth" in general.attributes:
-            result = result + prefix + "VerifyDepthMax=" + general.attributes["verifydepth"].nodeValue + "\n"
-
-        if "randombytes" in general.attributes:
-            result = result + "# NOTE: You may need to use IceSSL.EntropyDaemon\n"
-            result = result + prefix + "Random=" + general.attributes["randombytes"].nodeValue + "\n"
-
-    ca = findChild(node, "certauthority")
-    if ca:
-        if "file" in ca.attributes:
-            result = result + prefix + "CertAuthFile=" + ca.attributes["file"].nodeValue + "\n"
-        if "path" in ca.attributes:
-            result = result + prefix + "CertAuthDir=" + ca.attributes["path"].nodeValue + "\n"
-
-    basecerts = findChild(node, "basecerts")
-    if basecerts:
-        certFile = ""
-        keyFile = ""
-        rsacert = findChild(basecerts, "rsacert")
-        if rsacert:
-            pub = findChild(rsacert, "public")
-            if "encoding" in pub.attributes:
-                if pub.attributes["encoding"].nodeValue != "PEM":
-                    result = result + "# NOTE: Only PEM encoding is supported for certificates!\n"
-            if "filename" in pub.attributes:
-                certFile = pub.attributes["filename"].nodeValue
-            priv = findChild(rsacert, "private")
-            if "encoding" in priv.attributes:
-                if priv.attributes["encoding"].nodeValue != "PEM":
-                    result = result + "# NOTE: Only PEM encoding is supported for private keys!\n"
-            if "filename" in priv.attributes:
-                keyFile = priv.attributes["filename"].nodeValue
-        dsacert = findChild(basecerts, "dsacert")
-        if dsacert:
-            pub = findChild(dsacert, "public")
-            if "encoding" in pub.attributes:
-                if pub.attributes["encoding"].nodeValue != "PEM":
-                    result = result + "# NOTE: Only PEM encoding is supported for certificates!\n"
-            if "filename" in pub.attributes:
-                if len(certFile) > 0:
-                    certFile = certFile + sep + pub.attributes["filename"].nodeValue
-                else:
-                    certFile = pub.attributes["filename"].nodeValue
-            priv = findChild(rsacert, "private")
-            if "encoding" in priv.attributes:
-                if priv.attributes["encoding"].nodeValue != "PEM":
-                    result = result + "# NOTE: Only PEM encoding is supported for private keys!\n"
-            if "filename" in priv.attributes:
-                if len(keyFile) > 0:
-                    keyFile = keyFile + sep + priv.attributes["filename"].nodeValue
-                else:
-                    keyFile = priv.attributes["filename"].nodeValue
-        if len(certFile) > 0:
-            result = result + prefix + "CertFile=" + certFile + "\n"
-        if len(keyFile) > 0:
-            result = result + prefix + "KeyFile=" + keyFile + "\n"
-
-        for child in basecerts.childNodes:
-            if child.localName == "dhparams":
-                keysize = child.attributes["keysize"].nodeValue
-                if "encoding" in child.attributes:
-                    if child.attributes["encoding"].nodeValue != "PEM":
-                        result = result + "# NOTE: Only PEM encoding is supported for DH parameters!\n"
-                filename = child.attributes["filename"].nodeValue
-                result = result + prefix + "DH." + keysize + "=" + filename + "\n"
-
-    return result
-
-#
-# Check arguments
-#
-xmlfile = None
-for x in sys.argv[1:]:
-    if x == "-h":
-        usage()
-        sys.exit(0)
-    elif x.startswith("-"):
-        print(sys.argv[0] + ": unknown option `" + x + "'")
-        print("")
-        usage()
-        sys.exit(1)
-    else:
-        if xmlfile:
-            usage()
-            sys.exit(1)
-        xmlfile = x
-
-if not xmlfile:
-    usage()
-    sys.exit(1)
-
-f = open(xmlfile, 'r')
-doc = xml.dom.minidom.parse(f)
-f.close()
-
-config = findChild(doc, "SSLConfig")
-if not config:
-    print(sys.argv[0] + ": unable to find element SSLConfig")
-    sys.exit(1)
-
-client = findChild(config, "client")
-server = findChild(config, "server")
-output = None
-if client and server:
-    print(printConfig(client, "Client"))
-    print(printConfig(server, "Server", "#"))
-elif client:
-    print(printConfig(client, "Client"))
-elif server:
-    print(printConfig(server, "Server"))