diff options
Diffstat (limited to 'pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java')
| -rw-r--r-- | pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java | 871 |
1 files changed, 438 insertions, 433 deletions
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java index d82ee68bd..f237b0c70 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java @@ -1,5 +1,4 @@ package com.netscape.pkisilent; - // --- BEGIN COPYRIGHT BLOCK --- // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -39,7 +38,8 @@ import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; -public class ConfigureOCSP { +public class ConfigureOCSP +{ public static final String DEFAULT_KEY_TYPE = "RSA"; public static final String DEFAULT_KEY_SIZE = "2048"; public static final String DEFAULT_KEY_CURVENAME = "nistp256"; @@ -49,7 +49,7 @@ public class ConfigureOCSP { // define global variables public static HTTPClient hc = null; - + public static String login_uri = "/ocsp/admin/console/config/login"; public static String wizard_uri = "/ocsp/admin/console/config/wizard"; public static String admin_uri = "/ca/admin/ca/getBySerial"; @@ -75,7 +75,7 @@ public class ConfigureOCSP { public static String client_certdb_dir = null; public static String client_certdb_pwd = null; - // Login Panel + // Login Panel public static String pin = null; public static String domain_name = null; @@ -148,37 +148,42 @@ public class ConfigureOCSP { public static String backup_pwd = null; public static String backup_fname = null; - // cert subject names + // cert subject names public static String ocsp_sign_cert_subject_name = null; public static String ocsp_subsystem_cert_subject_name = null; public static String ocsp_server_cert_subject_name = null; public static String ocsp_audit_signing_cert_subject_name = null; public static String subsystem_name = null; - - public ConfigureOCSP() { + public ConfigureOCSP () + { // do nothing :) } - public void sleep_time() { - try { + public void sleep_time() + { + try + { System.out.println("Sleeping for 5 secs.."); Thread.sleep(5000); - } catch (Exception e) { + } + catch(Exception e) + { System.out.println("ERROR: sleep problem"); } } - public boolean LoginPanel() { + public boolean LoginPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String query_string = "pin=" + pin + "&xml=true"; - - hr = hc.sslConnect(cs_hostname, cs_port, login_uri, query_string); + String query_string = "pin=" + pin + "&xml=true"; + + hr = hc.sslConnect(cs_hostname,cs_port,login_uri,query_string); System.out.println("xml returned: " + hr.getHTML()); // parse xml here - nothing to parse @@ -186,26 +191,28 @@ public class ConfigureOCSP { // get cookie String temp = hr.getCookieValue("JSESSIONID"); - if (temp != null) { + if (temp!=null) { int index = temp.indexOf(";"); - HTTPClient.j_session_id = temp.substring(0, index); + HTTPClient.j_session_id = temp.substring(0,index); st = true; } hr = null; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, - "p=0&op=next&xml=true"); + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri, + "p=0&op=next&xml=true"); // parse xml here - bais = new ByteArrayInputStream(hr.getHTML().getBytes()); + bais = new ByteArrayInputStream( + hr.getHTML().getBytes()); px.parse(bais); px.prettyprintxml(); return st; } - public boolean TokenChoicePanel() { + public boolean TokenChoicePanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; @@ -215,9 +222,11 @@ public class ConfigureOCSP { // Software Token if (token_name.equalsIgnoreCase("internal")) { - query_string = "p=1" + "&op=next" + "&xml=true" + "&choice=" - + URLEncoder.encode("Internal Key Storage Token") + ""; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + query_string = "p=1" + "&op=next" + "&xml=true" + + "&choice=" + + URLEncoder.encode("Internal Key Storage Token") + + ""; + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); @@ -226,19 +235,24 @@ public class ConfigureOCSP { // HSM else { // login to hsm first - query_string = "p=2" + "&op=next" + "&xml=true" + "&uTokName=" - + URLEncoder.encode(token_name) + "&__uPasswd=" - + URLEncoder.encode(token_pwd) + ""; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + query_string = "p=2" + "&op=next" + "&xml=true" + + "&uTokName=" + + URLEncoder.encode(token_name) + + "&__uPasswd=" + + URLEncoder.encode(token_pwd) + + ""; + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); px.prettyprintxml(); - + // choice with token name now - query_string = "p=1" + "&op=next" + "&xml=true" + "&choice=" - + URLEncoder.encode(token_name) + ""; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + query_string = "p=1" + "&op=next" + "&xml=true" + + "&choice=" + + URLEncoder.encode(token_name) + + ""; + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); @@ -248,18 +262,24 @@ public class ConfigureOCSP { return true; } - public boolean DomainPanel() { + public boolean DomainPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String domain_url = "https://" + sd_hostname + ":" + sd_admin_port; - String query_string = "sdomainURL=" + URLEncoder.encode(domain_url) - + "&choice=existingdomain" + "&p=3" + "&op=next" + "&xml=true"; + String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ; + + String query_string = "sdomainURL=" + + URLEncoder.encode(domain_url) + + "&choice=existingdomain"+ + "&p=3" + + "&op=next" + + "&xml=true"; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); @@ -270,15 +290,16 @@ public class ConfigureOCSP { } - public boolean DisplayChainPanel() { + public boolean DisplayChainPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); String query_string = null; - query_string = "p=4" + "&op=next" + "&xml=true"; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + query_string = "p=4" + "&op=next" + "&xml=true"; + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml // bais = new ByteArrayInputStream(hr.getHTML().getBytes()); // px.parse(bais); @@ -288,41 +309,46 @@ public class ConfigureOCSP { } - public boolean SecurityDomainLoginPanel() { + public boolean SecurityDomainLoginPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String ocsp_url = "https://" + cs_hostname + ":" + cs_port - + "/ocsp/admin/console/config/wizard" + "?p=5&subsystem=OCSP"; - String query_string = "url=" + URLEncoder.encode(ocsp_url); + String ocsp_url = "https://" + cs_hostname + ":" + cs_port + + "/ocsp/admin/console/config/wizard" + + "?p=5&subsystem=OCSP" ; - hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_login_uri, - query_string); + String query_string = "url=" + URLEncoder.encode(ocsp_url); - String query_string_1 = "uid=" + sd_admin_name + "&pwd=" - + URLEncoder.encode(sd_admin_password) + "&url=" - + URLEncoder.encode(ocsp_url); + hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string); - hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_get_cookie_uri, - query_string_1); + String query_string_1 = "uid=" + sd_admin_name + + "&pwd=" + URLEncoder.encode(sd_admin_password) + + "&url=" + URLEncoder.encode(ocsp_url) ; + + hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri, + query_string_1); // get session id from security domain String ocsp_session_id = hr.getContentValue("header.session_id"); String ocsp_url_1 = hr.getContentValue("header.url"); - System.out.println("OCSP_SESSION_ID=" + ocsp_session_id); - System.out.println("OCSP_URL=" + ocsp_url_1); + System.out.println("OCSP_SESSION_ID=" + ocsp_session_id ); + System.out.println("OCSP_URL=" + ocsp_url_1 ); // use session id to connect back to OCSP - String query_string_2 = "p=5" + "&subsystem=OCSP" + "&session_id=" - + ocsp_session_id + "&xml=true"; + String query_string_2 = "p=5" + + "&subsystem=OCSP" + + "&session_id=" + ocsp_session_id + + "&xml=true" ; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string_2); + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri, + query_string_2); // parse xml // bais = new ByteArrayInputStream(hr.getHTML().getBytes()); @@ -332,18 +358,20 @@ public class ConfigureOCSP { return true; } - - public boolean SubsystemPanel() { + + public boolean SubsystemPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String query_string = "p=5" + "&op=next" + "&xml=true" - + "&subsystemName=" + URLEncoder.encode(subsystem_name) - + "&choice=newsubsystem"; + String query_string = "p=5" + "&op=next" + "&xml=true" + + "&subsystemName=" + + URLEncoder.encode(subsystem_name) + + "&choice=newsubsystem" ; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); @@ -352,25 +380,27 @@ public class ConfigureOCSP { return true; } - public boolean LdapConnectionPanel() { + public boolean LdapConnectionPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String query_string = "p=7" + "&op=next" + "&xml=true" + "&host=" - + URLEncoder.encode(ldap_host) + "&port=" - + URLEncoder.encode(ldap_port) + "&binddn=" - + URLEncoder.encode(bind_dn) + "&__bindpwd=" - + URLEncoder.encode(bind_password) + "&basedn=" - + URLEncoder.encode(base_dn) + "&database=" - + URLEncoder.encode(db_name) + "&display=" - + URLEncoder.encode("$displayStr") - + (secure_conn.equals("true") ? "&secureConn=on" : "") - + (clone_start_tls.equals("true") ? "&cloneStartTLS=on" : "") - + (remove_data.equals("true") ? "&removeData=true" : ""); - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + String query_string = "p=7" + "&op=next" + "&xml=true" + + "&host=" + URLEncoder.encode(ldap_host) + + "&port=" + URLEncoder.encode(ldap_port) + + "&binddn=" + URLEncoder.encode(bind_dn) + + "&__bindpwd=" + URLEncoder.encode(bind_password) + + "&basedn=" + URLEncoder.encode(base_dn) + + "&database=" + URLEncoder.encode(db_name) + + "&display=" + URLEncoder.encode("$displayStr") + + (secure_conn.equals("true")? "&secureConn=on": "") + + (clone_start_tls.equals("true")? "&cloneStartTLS=on": "") + + (remove_data.equals("true")? "&removeData=true": ""); + + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); @@ -380,65 +410,50 @@ public class ConfigureOCSP { return true; } - public boolean KeyPanel() { + public boolean KeyPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); ArrayList<String> al = null; - String query_string = "p=8" + "&op=next" + "&xml=true" - + "&signing_custom_size=" - + signing_key_size - + "&subsystem_custom_size=" - + subsystem_key_size - + "&sslserver_custom_size=" - + sslserver_key_size - + "&audit_signing_custom_size=" - + audit_signing_key_size - + "&custom_size=" - + key_size - + "&signing_custom_curvename=" - + signing_key_curvename - + "&subsystem_custom_curvename=" - + subsystem_key_curvename - + "&sslserver_custom_curvename=" - + sslserver_key_curvename - + "&audit_signing_custom_curvename=" - + audit_signing_key_curvename - + "&custom_curvename=" - + key_curvename - + "&signing_keytype=" - + signing_key_type - + "&subsystem_keytype=" - + subsystem_key_type - + "&sslserver_keytype=" - + sslserver_key_type - + "&audit_signing_keytype=" - + audit_signing_key_type - + "&keytype=" - + key_type - + "&signing_choice=custom" - + "&subsystem_choice=custom" - + "&sslserver_choice=custom" - + "&audit_signing_choice=custom" - + "&signingalgorithm=" - + signing_algorithm - + "&signing_signingalgorithm=" - + signing_signingalgorithm + "&choice=custom"; - - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + String query_string = "p=8" + "&op=next" + "&xml=true" + + "&signing_custom_size=" + signing_key_size + + "&subsystem_custom_size=" + subsystem_key_size + + "&sslserver_custom_size=" + sslserver_key_size + + "&audit_signing_custom_size=" + audit_signing_key_size + + "&custom_size=" + key_size + + "&signing_custom_curvename=" + signing_key_curvename + + "&subsystem_custom_curvename=" + subsystem_key_curvename + + "&sslserver_custom_curvename=" + sslserver_key_curvename + + "&audit_signing_custom_curvename=" + audit_signing_key_curvename + + "&custom_curvename=" + key_curvename + + "&signing_keytype=" + signing_key_type + + "&subsystem_keytype=" + subsystem_key_type + + "&sslserver_keytype=" + sslserver_key_type + + "&audit_signing_keytype=" + audit_signing_key_type + + "&keytype=" + key_type + + "&signing_choice=custom"+ + "&subsystem_choice=custom"+ + "&sslserver_choice=custom"+ + "&audit_signing_choice=custom" + + "&signingalgorithm=" + signing_algorithm + + "&signing_signingalgorithm=" + signing_signingalgorithm + + "&choice=custom"; + + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); px.prettyprintxml(); - - al = px.constructValueList("CertReqPair", "DN"); + + al = px.constructValueList("CertReqPair","DN"); // get ca cert subject name if (al != null) { - for (int i = 0; i < al.size(); i++) { - String temp = al.get(i); + for (int i=0; i < al.size(); i++) { + String temp = al.get(i); if (temp.indexOf("OCSP Signing") > 0) { ocsp_signing_cert_name = temp; } else if (temp.indexOf("OCSP Subsystem") > 0) { @@ -450,19 +465,17 @@ public class ConfigureOCSP { } } } - - System.out.println("default: ocsp_signing_cert_name=" - + ocsp_signing_cert_name); - System.out.println("default: ocsp_subsystem_cert_name=" - + ocsp_subsystem_cert_name); + + System.out.println("default: ocsp_signing_cert_name=" + ocsp_signing_cert_name); + System.out.println("default: ocsp_subsystem_cert_name=" + ocsp_subsystem_cert_name); System.out.println("default: server_cert_name=" + server_cert_name); - System.out.println("default: oscp_audit_signing_cert_name=" - + ocsp_audit_signing_cert_name); + System.out.println("default: oscp_audit_signing_cert_name=" + ocsp_audit_signing_cert_name); return true; } - public boolean CertSubjectPanel() { + public boolean CertSubjectPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; @@ -471,52 +484,57 @@ public class ConfigureOCSP { ArrayList<String> cert_list = null; ArrayList<String> dn_list = null; - String domain_url = "https://" + ca_hostname + ":" + ca_ssl_port; + String domain_url = "https://" + ca_hostname + ":" + ca_ssl_port ; - String query_string = "p=9" + "&op=next" + "&xml=true" + "&subsystem=" - + URLEncoder.encode(ocsp_subsystem_cert_subject_name) - + "&signing=" + URLEncoder.encode(ocsp_sign_cert_subject_name) - + "&sslserver=" - + URLEncoder.encode(ocsp_server_cert_subject_name) - + "&audit_signing=" - + URLEncoder.encode(ocsp_audit_signing_cert_subject_name) - + "&urls=" + URLEncoder.encode(domain_url) + ""; + String query_string = "p=9" + "&op=next" + "&xml=true" + + "&subsystem=" + + URLEncoder.encode(ocsp_subsystem_cert_subject_name) + + "&signing=" + + URLEncoder.encode(ocsp_sign_cert_subject_name) + + "&sslserver=" + + URLEncoder.encode(ocsp_server_cert_subject_name) + + "&audit_signing=" + + URLEncoder.encode(ocsp_audit_signing_cert_subject_name) + + "&urls=" + + URLEncoder.encode(domain_url) + + ""; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); px.prettyprintxml(); - - req_list = px.constructValueList("CertReqPair", "Request"); - cert_list = px.constructValueList("CertReqPair", "Certificate"); - dn_list = px.constructValueList("CertReqPair", "Nickname"); + + req_list = px.constructValueList("CertReqPair","Request"); + cert_list = px.constructValueList("CertReqPair","Certificate"); + dn_list = px.constructValueList("CertReqPair","Nickname"); if (req_list != null && cert_list != null && dn_list != null) { - for (int i = 0; i < dn_list.size(); i++) { - String temp = dn_list.get(i); - - if (temp.indexOf("ocspSigningCert") >= 0) { - ocsp_signing_cert_req = req_list.get(i); - ocsp_signing_cert_cert = cert_list.get(i); - } else if (temp.indexOf("subsystemCert") >= 0) { - ocsp_subsystem_cert_req = req_list.get(i); - ocsp_subsystem_cert_cert = cert_list.get(i); - } else if (temp.indexOf("auditSigningCert") >= 0) { - ocsp_audit_signing_cert_req = req_list.get(i); - ocsp_audit_signing_cert_cert = cert_list.get(i); + for (int i=0; i < dn_list.size(); i++) { + String temp = dn_list.get(i); + + if (temp.indexOf("ocspSigningCert") >= 0 ) { + ocsp_signing_cert_req = req_list.get(i); + ocsp_signing_cert_cert = cert_list.get(i); + } else if (temp.indexOf("subsystemCert") >= 0 ) { + ocsp_subsystem_cert_req = req_list.get(i); + ocsp_subsystem_cert_cert = cert_list.get(i); + } else if (temp.indexOf("auditSigningCert") >=0) { + ocsp_audit_signing_cert_req = req_list.get(i); + ocsp_audit_signing_cert_cert = cert_list.get(i); } else { - server_cert_req = req_list.get(i); - server_cert_cert = cert_list.get(i); + server_cert_req = req_list.get(i); + server_cert_cert = cert_list.get(i); } } } - + return true; } - public boolean CertificatePanel() { + public boolean CertificatePanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; @@ -526,58 +544,69 @@ public class ConfigureOCSP { ArrayList<String> dn_list = null; ArrayList<String> pp_list = null; - String query_string = "p=10" + "&op=next" + "&xml=true" + "&subsystem=" - + URLEncoder.encode(ocsp_subsystem_cert_cert) - + "&subsystem_cc=" + "&signing=" - + URLEncoder.encode(ocsp_signing_cert_cert) + "&signing_cc=" - + "&sslserver=" + URLEncoder.encode(server_cert_cert) - + "&sslserver_cc=" + "&audit_signing=" - + URLEncoder.encode(ocsp_audit_signing_cert_cert) - + "&audit_signing_cc=" + ""; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + String query_string = "p=10" + "&op=next" + "&xml=true" + + "&subsystem=" + + URLEncoder.encode(ocsp_subsystem_cert_cert) + + "&subsystem_cc=" + + "&signing=" + + URLEncoder.encode(ocsp_signing_cert_cert) + + "&signing_cc=" + + "&sslserver=" + + URLEncoder.encode(server_cert_cert) + + "&sslserver_cc=" + + "&audit_signing=" + + URLEncoder.encode(ocsp_audit_signing_cert_cert) + + "&audit_signing_cc=" + + ""; + + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); - + System.out.println("html returned=" + hr.getHTML()); px.parse(bais); px.prettyprintxml(); - + return true; } - public boolean BackupPanel() { + public boolean BackupPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String query_string = "p=11" + "&op=next" + "&xml=true" - + "&choice=backupkey" + "&__pwd=" - + URLEncoder.encode(backup_pwd) + "&__pwdagain=" - + URLEncoder.encode(backup_pwd); - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + String query_string = "p=11" + "&op=next" + "&xml=true" + + "&choice=backupkey" + + "&__pwd=" + URLEncoder.encode(backup_pwd) + + "&__pwdagain=" + URLEncoder.encode(backup_pwd); + + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); px.prettyprintxml(); - + return true; } - public boolean SavePKCS12Panel() { + public boolean SavePKCS12Panel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String query_string = ""; - hr = hc.sslConnect(cs_hostname, cs_port, pkcs12_uri, query_string); + String query_string = ""; + + hr = hc.sslConnect(cs_hostname,cs_port,pkcs12_uri,query_string); // dump hr.getResponseData() to file @@ -587,18 +616,17 @@ public class ConfigureOCSP { fos.close(); // set file to permissions 600 - String rtParams[] = { "chmod", "600", backup_fname }; + String rtParams[] = { "chmod","600", backup_fname}; Process proc = Runtime.getRuntime().exec(rtParams); - BufferedReader br = new BufferedReader(new InputStreamReader( - proc.getErrorStream())); + BufferedReader br = new BufferedReader(new InputStreamReader(proc.getErrorStream())); String line = null; - while ((line = br.readLine()) != null) - System.out.println("Error: " + line); + while ( (line = br.readLine()) != null) + System.out.println("Error: " + line); int exitVal = proc.waitFor(); - + // verify p12 file - + // Decode the P12 file FileInputStream fis = new FileInputStream(backup_fname); PFX.Template pfxt = new PFX.Template(); @@ -606,14 +634,14 @@ public class ConfigureOCSP { System.out.println("Decoded PFX"); // now peruse it for interesting info - System.out.println("Version: " + pfx.getVersion()); + System.out.println("Version: "+pfx.getVersion()); AuthenticatedSafes authSafes = pfx.getAuthSafes(); SEQUENCE asSeq = authSafes.getSequence(); - System.out.println("AuthSafes has " + asSeq.size() - + " SafeContents"); + System.out.println("AuthSafes has "+ + asSeq.size()+" SafeContents"); fis.close(); - } catch (Exception e) { + } catch(Exception e) { System.out.println("ERROR: Exception=" + e.getMessage()); return false; } @@ -621,17 +649,22 @@ public class ConfigureOCSP { return true; } - public boolean AdminCertReqPanel() { + public boolean AdminCertReqPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); String admin_cert_request = null; + String cert_subject = "CN=ocsp-" + admin_user; - ComCrypto cCrypt = new ComCrypto(client_certdb_dir, client_certdb_pwd, - agent_cert_subject, agent_key_size, agent_key_type); + ComCrypto cCrypt = new ComCrypto(client_certdb_dir, + client_certdb_pwd, + agent_cert_subject, + agent_key_size, + agent_key_type); cCrypt.setDebug(true); cCrypt.setGenerateRequest(true); cCrypt.setTransportCert(null); @@ -641,67 +674,78 @@ public class ConfigureOCSP { String crmf_request = cCrypt.generateCRMFrequest(); if (crmf_request == null) { - System.out - .println("ERROR: AdminCertReqPanel() cert req gen failed"); + System.out.println("ERROR: AdminCertReqPanel() cert req gen failed"); return false; } admin_cert_request = crmf_request; - String query_string = "p=13" + "&op=next" + "&xml=true" - + "&cert_request_type=" + "crmf" + "&uid=" + admin_user - + "&name=" + admin_user + "&__pwd=" - + URLEncoder.encode(admin_password) - + "&__admin_password_again=" - + URLEncoder.encode(admin_password) + "&profileId=" - + "caAdminCert" + "&email=" + URLEncoder.encode(admin_email) - + "&cert_request=" + URLEncoder.encode(admin_cert_request) - + "&subject=" + URLEncoder.encode(agent_cert_subject) - + "&clone=new" + "&import=true" + "&securitydomain=" - + URLEncoder.encode(domain_name) + ""; - - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + String query_string = "p=13" + "&op=next" + "&xml=true" + + "&cert_request_type=" + "crmf" + + "&uid=" + admin_user + + "&name=" + admin_user + + "&__pwd=" + URLEncoder.encode(admin_password) + + "&__admin_password_again=" + URLEncoder.encode(admin_password) + + "&profileId=" + "caAdminCert" + + "&email=" + + URLEncoder.encode(admin_email) + + "&cert_request=" + + URLEncoder.encode(admin_cert_request) + + "&subject=" + + URLEncoder.encode(agent_cert_subject) + + "&clone=new" + + "&import=true" + + "&securitydomain=" + + URLEncoder.encode(domain_name) + + ""; + + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); px.prettyprintxml(); - - admin_serial_number = px.getvalue("serialNumber"); + + admin_serial_number = px.getvalue("serialNumber"); return true; } - public boolean AdminCertImportPanel() { + public boolean AdminCertImportPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String query_string = "serialNumber=" + admin_serial_number - + "&importCert=" + "true" + ""; - - hr = hc.sslConnect(sd_hostname, sd_admin_port, admin_uri, query_string); + String query_string = "serialNumber=" + admin_serial_number + + "&importCert=" + "true" + + ""; + hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string); + // get response data - // String cert_to_import = - // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); - String cert_to_import = OSUtil.BtoA(hr.getResponseData()); + // String cert_to_import = + // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); + String cert_to_import = + OSUtil.BtoA(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); - ComCrypto cCrypt = new ComCrypto(client_certdb_dir, client_certdb_pwd, - null, null, null); + ComCrypto cCrypt = new ComCrypto(client_certdb_dir, + client_certdb_pwd, + null, + null, + null); cCrypt.setDebug(true); cCrypt.setGenerateRequest(true); cCrypt.loginDB(); - String start = "-----BEGIN CERTIFICATE-----\r\n"; - String end = "\r\n-----END CERTIFICATE-----"; + String start = "-----BEGIN CERTIFICATE-----\r\n" ; + String end = "\r\n-----END CERTIFICATE-----" ; - st = cCrypt.importCert(start + cert_to_import + end, agent_name); + st = cCrypt.importCert(start+cert_to_import+end,agent_name); if (!st) { - System.out - .println("ERROR: AdminCertImportPanel() during cert import"); + System.out.println("ERROR: AdminCertImportPanel() during cert import"); return false; } @@ -709,30 +753,37 @@ public class ConfigureOCSP { return true; } - public boolean UpdateDomainPanel() { + public boolean UpdateDomainPanel() + { boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String query_string = "p=14" + "&op=next" + "&xml=true" + "&caHost=" - + URLEncoder.encode(sd_hostname) + "&caPort=" - + URLEncoder.encode(sd_agent_port) + ""; + String query_string = "p=14" + "&op=next" + "&xml=true" + + "&caHost=" + URLEncoder.encode(sd_hostname) + + "&caPort=" + URLEncoder.encode(sd_agent_port) + + ""; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string); // parse xml bais = new ByteArrayInputStream(hr.getHTML().getBytes()); px.parse(bais); px.prettyprintxml(); - + return true; } - public boolean ConfigureOCSPInstance() { + + public boolean ConfigureOCSPInstance() + { // 0. login to cert db - ComCrypto cCrypt = new ComCrypto(client_certdb_dir, client_certdb_pwd, - null, null, null); + ComCrypto cCrypt = new ComCrypto(client_certdb_dir, + client_certdb_pwd, + null, + null, + null); cCrypt.setDebug(true); cCrypt.setGenerateRequest(true); cCrypt.loginDB(); @@ -751,8 +802,7 @@ public class ConfigureOCSP { // 2. Token Choice Panel boolean disp_token = TokenChoicePanel(); if (!disp_token) { - System.out - .println("ERROR: ConfigureOCSP: TokenChoicePanel() failure"); + System.out.println("ERROR: ConfigureOCSP: TokenChoicePanel() failure"); return false; } @@ -768,8 +818,7 @@ public class ConfigureOCSP { // 4. display cert chain panel boolean disp_st = DisplayChainPanel(); if (!disp_st) { - System.out - .println("ERROR: ConfigureOCSP: DisplayChainPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: DisplayChainPanel() failure"); return false; } @@ -777,8 +826,7 @@ public class ConfigureOCSP { // security domain login panel boolean disp_sd = SecurityDomainLoginPanel(); if (!disp_sd) { - System.out - .println("ERROR: ConfigureOCSP: SecurityDomainLoginPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: SecurityDomainLoginPanel() failure"); return false; } @@ -786,17 +834,15 @@ public class ConfigureOCSP { // subsystem panel boolean disp_ss = SubsystemPanel(); if (!disp_ss) { - System.out - .println("ERROR: ConfigureOCSP: SubsystemPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: SubsystemPanel() failure"); return false; } - + sleep_time(); // 7. ldap connection panel boolean disp_ldap = LdapConnectionPanel(); if (!disp_ldap) { - System.out - .println("ERROR: ConfigureOCSP: LdapConnectionPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: LdapConnectionPanel() failure"); return false; } @@ -813,8 +859,7 @@ public class ConfigureOCSP { // 10. Cert Subject Panel boolean disp_csubj = CertSubjectPanel(); if (!disp_csubj) { - System.out - .println("ERROR: ConfigureOCSP: CertSubjectPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: CertSubjectPanel() failure"); return false; } @@ -822,8 +867,7 @@ public class ConfigureOCSP { // 11. Certificate Panel boolean disp_cp = CertificatePanel(); if (!disp_cp) { - System.out - .println("ERROR: ConfigureOCSP: CertificatePanel() failure"); + System.out.println("ERROR: ConfigureOCSP: CertificatePanel() failure"); return false; } @@ -839,8 +883,7 @@ public class ConfigureOCSP { // save panel boolean disp_save = SavePKCS12Panel(); if (!disp_save) { - System.out - .println("ERROR: ConfigureOCSP: SavePKCS12Panel() failure"); + System.out.println("ERROR: ConfigureOCSP: SavePKCS12Panel() failure"); return false; } @@ -848,8 +891,7 @@ public class ConfigureOCSP { // 13. Admin Cert Req Panel boolean disp_adm = AdminCertReqPanel(); if (!disp_adm) { - System.out - .println("ERROR: ConfigureOCSP: AdminCertReqPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: AdminCertReqPanel() failure"); return false; } @@ -857,8 +899,7 @@ public class ConfigureOCSP { // 14. Admin Cert import Panel boolean disp_im = AdminCertImportPanel(); if (!disp_im) { - System.out - .println("ERROR: ConfigureOCSP: AdminCertImportPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: AdminCertImportPanel() failure"); return false; } @@ -866,8 +907,7 @@ public class ConfigureOCSP { // 15. Update Domain Panel boolean disp_ud = UpdateDomainPanel(); if (!disp_ud) { - System.out - .println("ERROR: ConfigureOCSP: UpdateDomainPanel() failure"); + System.out.println("ERROR: ConfigureOCSP: UpdateDomainPanel() failure"); return false; } @@ -883,7 +923,8 @@ public class ConfigureOCSP { } } - public static void main(String args[]) { + public static void main(String args[]) + { ConfigureOCSP ca = new ConfigureOCSP(); // set variables @@ -911,7 +952,7 @@ public class ConfigureOCSP { StringHolder x_admin_email = new StringHolder(); StringHolder x_admin_password = new StringHolder(); - // ldap + // ldap StringHolder x_ldap_host = new StringHolder(); StringHolder x_ldap_port = new StringHolder(); StringHolder x_bind_dn = new StringHolder(); @@ -972,160 +1013,132 @@ public class ConfigureOCSP { // parse the args ArgParser parser = new ArgParser("ConfigureOCSP"); - parser.addOption("-cs_hostname %s #CS Hostname", x_cs_hostname); - parser.addOption("-cs_port %s #CS SSL Admin port", x_cs_port); - - parser.addOption("-sd_hostname %s #Security Domain Hostname", - x_sd_hostname); - parser.addOption("-sd_ssl_port %s #Security Domain SSL EE port", - x_sd_ssl_port); - parser.addOption("-sd_agent_port %s #Security Domain SSL Agent port", - x_sd_agent_port); - parser.addOption("-sd_admin_port %s #Security Domain SSL Admin port", - x_sd_admin_port); - parser.addOption("-sd_admin_name %s #Security Domain Admin Name", - x_sd_admin_name); - parser.addOption( - "-sd_admin_password %s #Security Domain Admin password", - x_sd_admin_password); - - parser.addOption("-ca_hostname %s #CA Hostname", x_ca_hostname); - parser.addOption("-ca_port %s #CA non-SSL EE port", x_ca_port); - parser.addOption("-ca_ssl_port %s #CA SSL EE port", x_ca_ssl_port); - - parser.addOption("-client_certdb_dir %s #Client CertDB dir", - x_client_certdb_dir); - parser.addOption("-client_certdb_pwd %s #client certdb password", - x_client_certdb_pwd); - parser.addOption("-preop_pin %s #pre op pin", x_preop_pin); - parser.addOption("-domain_name %s #domain name", x_domain_name); - parser.addOption("-admin_user %s #Admin User Name", x_admin_user); - parser.addOption("-admin_email %s #Admin email", x_admin_email); - parser.addOption("-admin_password %s #Admin password", x_admin_password); - parser.addOption("-agent_name %s #Agent Cert Nickname", x_agent_name); - - parser.addOption("-ldap_host %s #ldap host", x_ldap_host); - parser.addOption("-ldap_port %s #ldap port", x_ldap_port); - parser.addOption("-bind_dn %s #ldap bind dn", x_bind_dn); - parser.addOption("-bind_password %s #ldap bind password", - x_bind_password); - parser.addOption("-base_dn %s #base dn", x_base_dn); - parser.addOption("-db_name %s #db name", x_db_name); - parser.addOption( - "-secure_conn %s #use ldaps port (optional, default is false)", - x_secure_conn); - parser.addOption( - "-remove_data %s #remove existing data under base_dn (optional, default is false) ", - x_remove_data); - parser.addOption( - "-clone_start_tls %s #use startTLS for cloning replication agreement (optional, default is false)", - x_clone_start_tls); + parser.addOption ("-cs_hostname %s #CS Hostname", + x_cs_hostname); + parser.addOption ("-cs_port %s #CS SSL Admin port", + x_cs_port); + + parser.addOption ("-sd_hostname %s #Security Domain Hostname", + x_sd_hostname); + parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port", + x_sd_ssl_port); + parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port", + x_sd_agent_port); + parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port", + x_sd_admin_port); + parser.addOption ("-sd_admin_name %s #Security Domain Admin Name", + x_sd_admin_name); + parser.addOption ("-sd_admin_password %s #Security Domain Admin password", + x_sd_admin_password); + + parser.addOption ("-ca_hostname %s #CA Hostname", + x_ca_hostname); + parser.addOption ("-ca_port %s #CA non-SSL EE port", + x_ca_port); + parser.addOption ("-ca_ssl_port %s #CA SSL EE port", + x_ca_ssl_port); + + parser.addOption ("-client_certdb_dir %s #Client CertDB dir", + x_client_certdb_dir); + parser.addOption ("-client_certdb_pwd %s #client certdb password", + x_client_certdb_pwd); + parser.addOption ("-preop_pin %s #pre op pin", + x_preop_pin); + parser.addOption ("-domain_name %s #domain name", + x_domain_name); + parser.addOption ("-admin_user %s #Admin User Name", + x_admin_user); + parser.addOption ("-admin_email %s #Admin email", + x_admin_email); + parser.addOption ("-admin_password %s #Admin password", + x_admin_password); + parser.addOption ("-agent_name %s #Agent Cert Nickname", + x_agent_name); + + parser.addOption ("-ldap_host %s #ldap host", + x_ldap_host); + parser.addOption ("-ldap_port %s #ldap port", + x_ldap_port); + parser.addOption ("-bind_dn %s #ldap bind dn", + x_bind_dn); + parser.addOption ("-bind_password %s #ldap bind password", + x_bind_password); + parser.addOption ("-base_dn %s #base dn", + x_base_dn); + parser.addOption ("-db_name %s #db name", + x_db_name); + parser.addOption("-secure_conn %s #use ldaps port (optional, default is false)", x_secure_conn); + parser.addOption("-remove_data %s #remove existing data under base_dn (optional, default is false) ", x_remove_data); + parser.addOption("-clone_start_tls %s #use startTLS for cloning replication agreement (optional, default is false)", x_clone_start_tls); // key and algorithm options (default) - parser.addOption( - "-key_type %s #Key type [RSA,ECC] (optional, default is RSA)", - x_key_type); - parser.addOption( - "-key_size %s #Key Size (optional, for RSA default is 2048)", - x_key_size); - parser.addOption( - "-key_curvename %s #Key Curve Name (optional, for ECC default is nistp256)", - x_key_curvename); - parser.addOption( - "-signing_algorithm %s #Signing algorithm (optional, default is SHA256withRSA for RSA and SHA256withEC for ECC)", - x_signing_algorithm); + parser.addOption("-key_type %s #Key type [RSA,ECC] (optional, default is RSA)", x_key_type); + parser.addOption("-key_size %s #Key Size (optional, for RSA default is 2048)", x_key_size); + parser.addOption("-key_curvename %s #Key Curve Name (optional, for ECC default is nistp256)", x_key_curvename); + parser.addOption("-signing_algorithm %s #Signing algorithm (optional, default is SHA256withRSA for RSA and SHA256withEC for ECC)", x_signing_algorithm); // key and algorithm options for signing certificate (overrides default) - parser.addOption( - "-signing_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", - x_signing_key_type); - parser.addOption( - "-signing_key_size %s #Key Size (optional, for RSA default is key_size)", - x_signing_key_size); - parser.addOption( - "-signing_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", - x_signing_key_curvename); - parser.addOption( - "-signing_signingalgorithm %s #Algorithm used be ocsp signing cert to sign objects (optional, default is signing_algorithm)", - x_signing_signingalgorithm); - - // key and algorithm options for audit_signing certificate (overrides - // default) - parser.addOption( - "-audit_signing_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", - x_audit_signing_key_type); - parser.addOption( - "-audit_signing_key_size %s #Key Size (optional, for RSA default is key_size)", - x_audit_signing_key_size); - parser.addOption( - "-audit_signing_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", - x_audit_signing_key_curvename); + parser.addOption("-signing_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", x_signing_key_type); + parser.addOption("-signing_key_size %s #Key Size (optional, for RSA default is key_size)", x_signing_key_size); + parser.addOption("-signing_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", x_signing_key_curvename); + parser.addOption("-signing_signingalgorithm %s #Algorithm used be ocsp signing cert to sign objects (optional, default is signing_algorithm)", x_signing_signingalgorithm); + + // key and algorithm options for audit_signing certificate (overrides default) + parser.addOption("-audit_signing_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", x_audit_signing_key_type); + parser.addOption("-audit_signing_key_size %s #Key Size (optional, for RSA default is key_size)", x_audit_signing_key_size); + parser.addOption("-audit_signing_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", x_audit_signing_key_curvename); + + // key and algorithm options for subsystem certificate (overrides default) + parser.addOption("-subsystem_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", x_subsystem_key_type); + parser.addOption("-subsystem_key_size %s #Key Size (optional, for RSA default is key_size)", x_subsystem_key_size); + parser.addOption("-subsystem_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", x_subsystem_key_curvename); + + // key and algorithm options for sslserver certificate (overrides default) + parser.addOption("-sslserver_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", x_sslserver_key_type); + parser.addOption("-sslserver_key_size %s #Key Size (optional, for RSA default is key_size)", x_sslserver_key_size); + parser.addOption("-sslserver_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", x_sslserver_key_curvename); + + parser.addOption ("-token_name %s #HSM/Software Token name", + x_token_name); + parser.addOption ("-token_pwd %s #HSM/Software Token password (optional, required for HSM)", + x_token_pwd); + + parser.addOption ("-agent_key_size %s #Agent Cert Key Size", + x_agent_key_size); + parser.addOption ("-agent_key_type %s #Agent Cert Key type [rsa]", + x_agent_key_type); + parser.addOption ("-agent_cert_subject %s #Agent Cert Subject", + x_agent_cert_subject); + + parser.addOption ("-backup_pwd %s #PKCS12 password", + x_backup_pwd); + + parser.addOption ( + "-ocsp_sign_cert_subject_name %s #OCSP cert subject name", + x_ocsp_sign_cert_subject_name); + parser.addOption ( + "-ocsp_subsystem_cert_subject_name %s #OCSP subsystem cert subject name", + x_ocsp_subsystem_cert_subject_name); + parser.addOption ( + "-ocsp_server_cert_subject_name %s #OCSP server cert subject name", + x_ocsp_server_cert_subject_name); + + parser.addOption("-backup_fname %s #Backup File for p12, (optional, default /root/tmp-ocsp.p12", + x_backup_fname); + + parser.addOption ( + "-subsystem_name %s #OCSP subsystem name", + x_subsystem_name); - // key and algorithm options for subsystem certificate (overrides - // default) - parser.addOption( - "-subsystem_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", - x_subsystem_key_type); - parser.addOption( - "-subsystem_key_size %s #Key Size (optional, for RSA default is key_size)", - x_subsystem_key_size); - parser.addOption( - "-subsystem_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", - x_subsystem_key_curvename); - - // key and algorithm options for sslserver certificate (overrides - // default) - parser.addOption( - "-sslserver_key_type %s #Key type [RSA,ECC] (optional, default is key_type)", - x_sslserver_key_type); - parser.addOption( - "-sslserver_key_size %s #Key Size (optional, for RSA default is key_size)", - x_sslserver_key_size); parser.addOption( - "-sslserver_key_curvename %s #Key Curve Name (optional, for ECC default is key_curvename)", - x_sslserver_key_curvename); - - parser.addOption("-token_name %s #HSM/Software Token name", - x_token_name); - parser.addOption( - "-token_pwd %s #HSM/Software Token password (optional, required for HSM)", - x_token_pwd); - - parser.addOption("-agent_key_size %s #Agent Cert Key Size", - x_agent_key_size); - parser.addOption("-agent_key_type %s #Agent Cert Key type [rsa]", - x_agent_key_type); - parser.addOption("-agent_cert_subject %s #Agent Cert Subject", - x_agent_cert_subject); - - parser.addOption("-backup_pwd %s #PKCS12 password", x_backup_pwd); - - parser.addOption( - "-ocsp_sign_cert_subject_name %s #OCSP cert subject name", - x_ocsp_sign_cert_subject_name); - parser.addOption( - "-ocsp_subsystem_cert_subject_name %s #OCSP subsystem cert subject name", - x_ocsp_subsystem_cert_subject_name); - parser.addOption( - "-ocsp_server_cert_subject_name %s #OCSP server cert subject name", - x_ocsp_server_cert_subject_name); - - parser.addOption( - "-backup_fname %s #Backup File for p12, (optional, default /root/tmp-ocsp.p12", - x_backup_fname); - - parser.addOption("-subsystem_name %s #OCSP subsystem name", - x_subsystem_name); - - parser.addOption( - "-ocsp_audit_signing_cert_subject_name %s #OCSP audit signing cert subject name", - x_ocsp_audit_signing_cert_subject_name); + "-ocsp_audit_signing_cert_subject_name %s #OCSP audit signing cert subject name", + x_ocsp_audit_signing_cert_subject_name); // and then match the arguments - String[] unmatched = null; - unmatched = parser.matchAllArgs(args, 0, ArgParser.EXIT_ON_UNMATCHED); + String [] unmatched = null; + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); - if (unmatched != null) { + if (unmatched!=null) { System.out.println("ERROR: Argument Mismatch"); System.exit(-1); } @@ -1169,38 +1182,28 @@ public class ConfigureOCSP { key_type = set_default(x_key_type.value, DEFAULT_KEY_TYPE); signing_key_type = set_default(x_signing_key_type.value, key_type); - audit_signing_key_type = set_default(x_audit_signing_key_type.value, - key_type); + audit_signing_key_type = set_default(x_audit_signing_key_type.value, key_type); subsystem_key_type = set_default(x_subsystem_key_type.value, key_type); sslserver_key_type = set_default(x_sslserver_key_type.value, key_type); key_size = set_default(x_key_size.value, DEFAULT_KEY_SIZE); signing_key_size = set_default(x_signing_key_size.value, key_size); - audit_signing_key_size = set_default(x_audit_signing_key_size.value, - key_size); + audit_signing_key_size = set_default(x_audit_signing_key_size.value, key_size); subsystem_key_size = set_default(x_subsystem_key_size.value, key_size); sslserver_key_size = set_default(x_sslserver_key_size.value, key_size); - key_curvename = set_default(x_key_curvename.value, - DEFAULT_KEY_CURVENAME); - signing_key_curvename = set_default(x_signing_key_curvename.value, - key_curvename); - audit_signing_key_curvename = set_default( - x_audit_signing_key_curvename.value, key_curvename); - subsystem_key_curvename = set_default(x_subsystem_key_curvename.value, - key_curvename); - sslserver_key_curvename = set_default(x_sslserver_key_curvename.value, - key_curvename); + key_curvename = set_default(x_key_curvename.value, DEFAULT_KEY_CURVENAME); + signing_key_curvename = set_default(x_signing_key_curvename.value, key_curvename); + audit_signing_key_curvename = set_default(x_audit_signing_key_curvename.value, key_curvename); + subsystem_key_curvename = set_default(x_subsystem_key_curvename.value, key_curvename); + sslserver_key_curvename = set_default(x_sslserver_key_curvename.value, key_curvename); if (signing_key_type.equalsIgnoreCase("RSA")) { - signing_algorithm = set_default(x_signing_algorithm.value, - DEFAULT_KEY_ALGORITHM_RSA); + signing_algorithm = set_default(x_signing_algorithm.value, DEFAULT_KEY_ALGORITHM_RSA); } else { - signing_algorithm = set_default(x_signing_algorithm.value, - DEFAULT_KEY_ALGORITHM_ECC); + signing_algorithm = set_default(x_signing_algorithm.value, DEFAULT_KEY_ALGORITHM_ECC); } - signing_signingalgorithm = set_default( - x_signing_signingalgorithm.value, signing_algorithm); + signing_signingalgorithm = set_default(x_signing_signingalgorithm.value, signing_algorithm); token_name = x_token_name.value; token_pwd = x_token_pwd.value; @@ -1211,24 +1214,26 @@ public class ConfigureOCSP { backup_pwd = x_backup_pwd.value; backup_fname = set_default(x_backup_fname.value, "/root/tmp-ocsp.p12"); + + ocsp_sign_cert_subject_name = x_ocsp_sign_cert_subject_name.value ; + ocsp_subsystem_cert_subject_name = + x_ocsp_subsystem_cert_subject_name.value; + ocsp_server_cert_subject_name = x_ocsp_server_cert_subject_name.value ; + ocsp_audit_signing_cert_subject_name = x_ocsp_audit_signing_cert_subject_name.value; + + subsystem_name = x_subsystem_name.value ; - ocsp_sign_cert_subject_name = x_ocsp_sign_cert_subject_name.value; - ocsp_subsystem_cert_subject_name = x_ocsp_subsystem_cert_subject_name.value; - ocsp_server_cert_subject_name = x_ocsp_server_cert_subject_name.value; - ocsp_audit_signing_cert_subject_name = x_ocsp_audit_signing_cert_subject_name.value; - - subsystem_name = x_subsystem_name.value; boolean st = ca.ConfigureOCSPInstance(); - + if (!st) { System.out.println("ERROR: unable to create OCSP"); System.exit(-1); } - + System.out.println("Certificate System - OCSP Instance Configured"); System.exit(0); - + } }; |