diff options
Diffstat (limited to 'java/test/IceSSL/certs/makecerts.py')
| -rwxr-xr-x | java/test/IceSSL/certs/makecerts.py | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/java/test/IceSSL/certs/makecerts.py b/java/test/IceSSL/certs/makecerts.py index 6e5621a9ae6..228296ca59b 100755 --- a/java/test/IceSSL/certs/makecerts.py +++ b/java/test/IceSSL/certs/makecerts.py @@ -63,18 +63,18 @@ for x in ("cacert1", "cacert2"): ts = x + ".jks" os.system("openssl x509 -in " + os.path.join(cppcerts, x) + ".pem -outform DER -out " + x + ".der") if force or not os.path.exists(ts): - if os.path.exists(ts): - os.remove(ts) - os.system("keytool -import -alias cacert -file " + x + ".der -keystore " + ts + \ - " -storepass password -noprompt") - print "Created " + ts + if os.path.exists(ts): + os.remove(ts) + os.system("keytool -import -alias cacert -file " + x + ".der -keystore " + ts + \ + " -storepass password -noprompt") + print "Created " + ts # # Create a truststore containing both CA certificates. # if force or not os.path.exists("cacerts.jks"): if os.path.exists("cacerts.jks"): - os.remove("cacerts.jks") + os.remove("cacerts.jks") os.system("keytool -import -alias cacert1 -file cacert1.der -keystore cacerts.jks -storepass password -noprompt") os.system("keytool -import -alias cacert2 -file cacert2.der -keystore cacerts.jks -storepass password -noprompt") print "Created cacerts.jks" @@ -87,19 +87,19 @@ for x in certs: p12 = x.replace("nopass_", "") + ".p12" ks = x.replace("nopass_", "") + ".jks" if x.find("1") > 0: - cacert = "cacert1" + cacert = "cacert1" else: - cacert = "cacert2" + cacert = "cacert2" if force or not os.path.exists(ks): - if os.path.exists(ks): - os.remove(ks) - cert = os.path.join(cppcerts, x) - ca = os.path.join(cppcerts, cacert) + ".pem" - os.system("openssl pkcs12 -in " + cert + "_pub.pem -inkey " + cert + "_priv.pem -export -out " + p12 + \ - " -name cert -passout pass:password -certfile " + ca) - os.system("java -classpath ../../../certs ImportKey " + p12 + " cert " + cacert + ".der " + ks + " password") - os.remove(p12) - print "Created " + ks + if os.path.exists(ks): + os.remove(ks) + cert = os.path.join(cppcerts, x) + ca = os.path.join(cppcerts, cacert) + ".pem" + os.system("openssl pkcs12 -in " + cert + "_pub.pem -inkey " + cert + "_priv.pem -export -out " + p12 + \ + " -name cert -passout pass:password -certfile " + ca) + os.system("java -classpath ../../../certs ImportKey " + p12 + " cert " + cacert + ".der " + ks + " password") + os.remove(p12) + print "Created " + ks # # Create a keystore that contains both RSA and DSS certificates. @@ -107,19 +107,19 @@ for x in certs: ks = "s_rsa_dsa_ca1.jks" if force or not os.path.exists(ks): if os.path.exists(ks): - os.remove(ks) + os.remove(ks) cacert = "cacert1" ca = os.path.join(cppcerts, cacert) + ".pem" p12 = "s_dsa_nopass_ca1.p12" cert = os.path.join(cppcerts, "s_dsa_nopass_ca1") os.system("openssl pkcs12 -in " + cert + "_pub.pem -inkey " + cert + "_priv.pem -export -out " + p12 + \ - " -name dsacert -passout pass:password -certfile " + ca) + " -name dsacert -passout pass:password -certfile " + ca) os.system("java -classpath ../../../certs ImportKey " + p12 + " dsacert " + cacert + ".der " + ks + " password") os.remove(p12) p12 = "s_rsa_nopass_ca1.p12" cert = os.path.join(cppcerts, "s_rsa_nopass_ca1") os.system("openssl pkcs12 -in " + cert + "_pub.pem -inkey " + cert + "_priv.pem -export -out " + p12 + \ - " -name rsacert -passout pass:password -certfile " + ca) + " -name rsacert -passout pass:password -certfile " + ca) os.system("java -classpath ../../../certs ImportKey " + p12 + " rsacert " + cacert + ".der " + ks + " password") os.remove(p12) print "Created " + ks @@ -130,7 +130,7 @@ if force or not os.path.exists(ks): for x in ("cacert1", "cacert2"): cert = x + ".der" if os.path.exists(cert): - os.remove(cert) + os.remove(cert) # # Done. # |