Merge remote-tracking branch 'origin/main'

# Conflicts:
#	spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java

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

@@ -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();