Skip to content

Commit

Permalink
fix key store
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfedh committed Nov 8, 2023
1 parent c0b836a commit c75efc2
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ public class SslServerConfig {
public Optional<Path> key;

/**
* An optional key store which holds the certificate information instead of specifying separate files.
* The key store can be either on classpath or an external file.
* An optional keystore that holds the certificate information instead of specifying separate files.
* The keystore can be either on classpath or an external file.
*/
@ConfigItem
public Optional<Path> keyStore;

/**
* An optional parameter to specify the type of the key store file. If not given, the type is automatically detected
* An optional parameter to specify the type of the keystore file. If not given, the type is automatically detected
* based on the file name.
*/
@ConfigItem
public Optional<String> keyStoreType;

/**
* A parameter to specify the password of the key store file. If not given, the default ("password") is used.
* A parameter to specify the password of the keystore file. If not given, the default ("password") is used.
*/
@ConfigItem
public Optional<String> keyStorePassword;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,13 @@ public static class Jwt {
public Optional<String> keyFile = Optional.empty();

/**
* If provided, indicates that JWT is signed using a private key from a key store
* If provided, indicates that JWT is signed using a private key from a keystore.
*/
@ConfigItem
public Optional<String> keyStoreFile = Optional.empty();

/**
* A parameter to specify the password of the key store file.
* A parameter to specify the password of the keystore file.
*/
@ConfigItem
public Optional<String> keyStorePassword;
Expand Down Expand Up @@ -448,34 +448,34 @@ public enum Verification {
public Optional<Verification> verification = Optional.empty();

/**
* An optional key store which holds the certificate information instead of specifying separate files.
* An optional keystore that holds the certificate information instead of specifying separate files.
*/
@ConfigItem
public Optional<Path> keyStoreFile = Optional.empty();

/**
* An optional parameter to specify type of the key store file. If not given, the type is automatically detected
* An optional parameter to specify type of the keystore file. If not given, the type is automatically detected
* based on the file name.
*/
@ConfigItem
public Optional<String> keyStoreFileType = Optional.empty();

/**
* An optional parameter to specify a provider of the key store file. If not given, the provider is automatically
* An optional parameter to specify a provider of the keystore file. If not given, the provider is automatically
* detected
* based on the key store file type.
* based on the keystore file type.
*/
@ConfigItem
public Optional<String> keyStoreProvider;

/**
* A parameter to specify the password of the key store file. If not given, the default ("password") is used.
* A parameter to specify the password of the keystore file. If not given, the default ("password") is used.
*/
@ConfigItem
public Optional<String> keyStorePassword;

/**
* An optional parameter to select a specific key in the key store. When SNI is disabled, if the key store contains
* An optional parameter to select a specific key in the keystore. When SNI is disabled, if the keystore contains
* multiple
* keys and no alias is specified, the behavior is undefined.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,27 @@ public class CertificateConfig {
public Optional<List<Path>> keyFiles;

/**
* An optional key store that holds the certificate information instead of specifying separate files.
* An optional keystore that holds the certificate information instead of specifying separate files.
*/
@ConfigItem
public Optional<Path> keyStoreFile;

/**
* An optional parameter to specify the type of the key store file.
* An optional parameter to specify the type of the keystore file.
* If not given, the type is automatically detected based on the file name.
*/
@ConfigItem
public Optional<String> keyStoreFileType;

/**
* An optional parameter to specify a provider of the key store file.
* If not given, the provider is automatically detected based on the key store file type.
* An optional parameter to specify a provider of the keystore file.
* If not given, the provider is automatically detected based on the keystore file type.
*/
@ConfigItem
public Optional<String> keyStoreProvider;

/**
* A parameter to specify the password of the key store file.
* A parameter to specify the password of the keystore file.
* If not given, and if it can not be retrieved from {@linkplain CredentialsProvider}.
*
* @see {@link #credentialsProvider}
Expand All @@ -98,8 +98,8 @@ public class CertificateConfig {
public Optional<String> keyStorePasswordKey;

/**
* An optional parameter to select a specific key in the key store.
* When SNI is disabled, and the key store contains multiple
* An optional parameter to select a specific key in the keystore.
* When SNI is disabled, and the keystore contains multiple
* keys and no alias is specified; the behavior is undefined.
*/
@ConfigItem
Expand Down

0 comments on commit c75efc2

Please sign in to comment.