Fix: private keys not retrieved from keystore

Author: mlookaxw

CHANGELOG.adoc

@@ -9,6 +9,17 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 
+== Version 0.4.3
+[cols="1,2,<10a", options="header"]
+|===
+|ID|Type|Description
+|0
+|Fix
+|Due to a bug private keys are not retrieved from a keystore.
+This is fixed now.
+|===
+
+
 == Version 0.4.2
 [cols="1,2,<10a", options="header"]
 |===

pom.xml

@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.axway-api-management-plus</groupId>
 	<artifactId>yamles-utils</artifactId>
-	<version>0.4.2</version>
+	<version>0.4.3</version>
 	<packaging>jar</packaging>
 	<name>YAML Entity Store Utilities</name>
 	<description>Utilities for YAML Entity Store based API Gateway projects.</description>

src/main/java/com/axway/yamles/utils/spi/impl/KeystoreCertificateProvider.java

@@ -130,7 +130,7 @@ public CertificateReplacement getCertificate(File configSource, String aliasName
 			boolean nokey = getConfig(CFG_NOKEY, config, "false").equals("true");
 			Key key = ks.getKey(aliasName, password);
 			log.debug("key for alias '{}' {}found", aliasName, (key == null) ? "not " : "");
-			if (!nokey && key != null) {
+			if (key != null && nokey) {
 				key = null;
 				log.debug("key for alias '{}' suppressed", aliasName);
 			}

src/test/java/com/axway/yamles/utils/spi/impl/KeystoreCertificateProviderTest.java

@@ -48,6 +48,7 @@ void testKeystoreFromData() throws Exception {
 
 		assertEquals("server", cr.getAlias());
 		assertTrue(cr.getCert().isPresent());
+		assertTrue(cr.getKey().isPresent());
 	}
 
 	@Test
@@ -65,5 +66,6 @@ void testKeystoreFromPath() throws Exception {
 
 		assertEquals("server", cr.getAlias());
 		assertTrue(cr.getCert().isPresent());
+		assertTrue(cr.getKey().isPresent());		
 	}
 }