Add PEM support to cli #9497
Merged
Add PEM support to cli #9497
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Nit: uppercase "CLI" in commit message and write "KeyStore" and "TrustStore" |
|
Actually, this adds support to both CLI and JDBC |
electrum
reviewed
Dec 6, 2017
| @@ -170,6 +182,31 @@ public static void setupSsl( | |||
| } | |||
| } | |||
|
|
|||
| private static KeyStore loadTrustStore(File trustStorePath, Optional<String> trustStorePassword) | |||
| throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException | |||
There was a problem hiding this comment.
Should this be IOException, GeneralSecurityException
electrum
reviewed
Dec 6, 2017
| } | ||
| } | ||
| } | ||
| catch (IOException | GeneralSecurityException e) { |
electrum
reviewed
Dec 6, 2017
| trustStore.load(null, null); | ||
| for (X509Certificate certificate : certificateChain) { | ||
| X500Principal principal = certificate.getSubjectX500Principal(); | ||
| trustStore.setCertificateEntry(principal.getName("RFC2253"), certificate); |
There was a problem hiding this comment.
You can use getName() which is the same. BTW, there's also a X500Principal.RFC2253 constant
electrum
approved these changes
Dec 6, 2017
Existing keystore and truststore properties can now be used for PEM files in the CLI
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Existing keystore and truststore properties can now be used for PEM files in the CLI