SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java
This commit is contained in:
Olga MaciaszekSharma
2023-06-28 14:41:20 +02:00
parent 7efe08c674 f0ccaf01ac
commit 63c3eb614d
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java
View File

@@ -39,15 +39,7 @@ public class EncryptorFactory {
TextEncryptor encryptor;
if (data.contains("RSA PRIVATE KEY")) {
encryptor = new RsaSecretEncryptor(data);
try {
}
catch (IllegalArgumentException e) {
throw new KeyFormatException(e);
}
encryptor = new RsaSecretEncryptor(data);
}
else if (data.startsWith("ssh-rsa") || data.contains("RSA PUBLIC KEY")) {
throw new KeyFormatException();