diff options
| author | Ade Lee <alee@redhat.com> | 2016-07-29 14:42:35 +0100 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2016-07-29 22:19:32 +0100 |
| commit | 7cfff9fb0c08d08f57d6229cb8a67d7c94f785aa (patch) | |
| tree | d1df8476763a8bdb72a0b4a7dd597c6a331bfa11 /base/java-tools/src | |
| parent | d85080be85eb54756d9db69302a6117cef063017 (diff) | |
| download | pki-7cfff9fb0c08d08f57d6229cb8a67d7c94f785aa.tar.gz pki-7cfff9fb0c08d08f57d6229cb8a67d7c94f785aa.tar.xz pki-7cfff9fb0c08d08f57d6229cb8a67d7c94f785aa.zip | |
Fix client-cert-import to set provided trust bits
Ticket 2412
Diffstat (limited to 'base/java-tools/src')
| -rw-r--r-- | base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java b/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java index 9625440c0..a920079c4 100644 --- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java @@ -83,7 +83,7 @@ public class ClientCertImportCLI extends CLI { option.setArgName("serial number"); options.addOption(option); - option = new Option(null, "trust", true, "Trust attributes. Default: u,u,u."); + option = new Option(null, "trust", true, "Trust attributes."); option.setArgName("trust attributes"); options.addOption(option); } @@ -140,13 +140,16 @@ public class ClientCertImportCLI extends CLI { String pkcs12PasswordPath = cmd.getOptionValue("pkcs12-password-file"); boolean importFromCAServer = cmd.hasOption("ca-server"); String serialNumber = cmd.getOptionValue("serial"); - String trustAttributes = cmd.getOptionValue("trust", "u,u,u"); + String trustAttributes = cmd.getOptionValue("trust"); // load the certificate if (certPath != null) { if (verbose) System.out.println("Importing certificate from " + certPath + "."); + if (trustAttributes == null) + trustAttributes = "u,u,u"; + importCert( mainCLI.certDatabase.getAbsolutePath(), certPath, @@ -157,7 +160,8 @@ public class ClientCertImportCLI extends CLI { if (verbose) System.out.println("Importing CA certificate from " + caCertPath + "."); - trustAttributes = "CT,c,"; + if (trustAttributes == null) + trustAttributes = "CT,c,"; importCert( mainCLI.certDatabase.getAbsolutePath(), @@ -218,7 +222,8 @@ public class ClientCertImportCLI extends CLI { out.write(bytes); } - trustAttributes = "CT,c,"; + if (trustAttributes == null) + trustAttributes = "CT,c,"; importCert( mainCLI.certDatabase.getAbsolutePath(), @@ -250,6 +255,9 @@ public class ClientCertImportCLI extends CLI { out.write(encoded); } + if (trustAttributes == null) + trustAttributes = "u,u,u"; + importCert( mainCLI.certDatabase.getAbsolutePath(), certFile.getAbsolutePath(), |