Skip to content

Commit a18bafd

Browse files
committed
Rename
1 parent b8a260c commit a18bafd

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemKeyConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private PrivateKey getPrivateKey(Path path) {
129129
} catch (AccessControlException e) {
130130
throw SslFileUtil.accessControlFailure(KEY_FILE_TYPE, List.of(path), e, configBasePath);
131131
} catch (NotEntitledException e) {
132-
throw SslFileUtil.accessControlFailure(KEY_FILE_TYPE, List.of(path), e, configBasePath);
132+
throw SslFileUtil.notEntitledFailure(KEY_FILE_TYPE, List.of(path), e, configBasePath);
133133
} catch (IOException e) {
134134
throw SslFileUtil.ioException(KEY_FILE_TYPE, List.of(path), e);
135135
} catch (GeneralSecurityException e) {

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemTrustConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private List<Certificate> readCertificates(List<Path> paths) {
102102
} catch (AccessControlException e) {
103103
throw SslFileUtil.accessControlFailure(CA_FILE_TYPE, paths, e, basePath);
104104
} catch (NotEntitledException e) {
105-
throw SslFileUtil.accessControlFailure(CA_FILE_TYPE, paths, e, basePath);
105+
throw SslFileUtil.notEntitledFailure(CA_FILE_TYPE, paths, e, basePath);
106106
} catch (IOException e) {
107107
throw SslFileUtil.ioException(CA_FILE_TYPE, paths, e);
108108
} catch (GeneralSecurityException e) {

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public static PrivateKey readPrivateKey(Path path, Supplier<char[]> passwordSupp
114114
} catch (AccessControlException e) {
115115
throw SslFileUtil.accessControlFailure("PEM private key", List.of(path), e, null);
116116
} catch (NotEntitledException e) {
117-
throw SslFileUtil.accessControlFailure("PEM private key", List.of(path), e, null);
117+
throw SslFileUtil.notEntitledFailure("PEM private key", List.of(path), e, null);
118118
} catch (IOException e) {
119119
throw SslFileUtil.ioException("PEM private key", List.of(path), e);
120120
} catch (GeneralSecurityException e) {

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslFileUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static SslConfigException accessDenied(String fileType, List<Path> paths, Access
8080
return new SslConfigException(message, cause);
8181
}
8282

83-
static SslConfigException accessControlFailure(String fileType, List<Path> paths, NotEntitledException cause, Path basePath) {
83+
static SslConfigException notEntitledFailure(String fileType, List<Path> paths, NotEntitledException cause, Path basePath) {
8484
return innerAccessControlFailure(fileType, paths, cause, basePath);
8585
}
8686

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private KeyStore readKeyStore(Path path) {
170170
} catch (AccessControlException e) {
171171
throw SslFileUtil.accessControlFailure("[" + type + "] keystore", List.of(path), e, configBasePath);
172172
} catch (NotEntitledException e) {
173-
throw SslFileUtil.accessControlFailure("[" + type + "] keystore", List.of(path), e, configBasePath);
173+
throw SslFileUtil.notEntitledFailure("[" + type + "] keystore", List.of(path), e, configBasePath);
174174
} catch (IOException e) {
175175
throw SslFileUtil.ioException("[" + type + "] keystore", List.of(path), e);
176176
} catch (GeneralSecurityException e) {

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private KeyStore readKeyStore(Path path) {
9898
} catch (AccessControlException e) {
9999
throw SslFileUtil.accessControlFailure(fileTypeForException(), List.of(path), e, configBasePath);
100100
} catch (NotEntitledException e) {
101-
throw SslFileUtil.accessControlFailure(fileTypeForException(), List.of(path), e, configBasePath);
101+
throw SslFileUtil.notEntitledFailure(fileTypeForException(), List.of(path), e, configBasePath);
102102
} catch (IOException e) {
103103
throw SslFileUtil.ioException(fileTypeForException(), List.of(path), e, getAdditionalErrorDetails());
104104
} catch (GeneralSecurityException e) {

0 commit comments

Comments
 (0)