From 5e29ff1a6f53c6227485f8debcf1737f47cd0351 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Wed, 27 Feb 2019 11:31:56 -0500
Subject: [PATCH] Add new type property to KeyStore properties. (#486)

---
 .../cloud/bootstrap/encrypt/KeyProperties.java      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java
index 2d212f1d..ee4eaefe 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java
@@ -98,6 +98,11 @@ public class KeyProperties {
 		 */
 		private String secret;
 
+		/**
+		 * The KeyStore type.  Defaults to jks.
+		 */
+		private String type = "jks";
+
 		public String getAlias() {
 			return this.alias;
 		}
@@ -118,6 +123,10 @@ public class KeyProperties {
 			return this.password;
 		}
 
+		public String getType() {
+			return type;
+		}
+
 		public void setPassword(String password) {
 			this.password = password;
 		}
@@ -130,5 +139,9 @@ public class KeyProperties {
 			this.secret = secret;
 		}
 
+		public void setType(String type) {
+			this.type = type;
+		}
+
 	}
 }
\ No newline at end of file