From d2178bc9f7d6c06f60a3a8afecd83e428d84cd78 Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 8 Feb 2021 14:36:11 +0100 Subject: Remove test usage of the AAF certificate Fix the broken build by removing the need of the useless certificate, a new one is now generate during the build for the tests. Issue-ID: POLICY-3036 Signed-off-by: sebdet Change-Id: I11c2ff5aac8a99c7a2b7e676d6c11bbc861a1de4 Signed-off-by: sebdet --- .../java/org/onap/policy/clamp/clds/config/SslConfig.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java b/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java index 329cb4bed..a72cffd09 100644 --- a/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java +++ b/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP CLAMP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights + * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -74,6 +74,7 @@ public class SslConfig { password.toCharArray()); return truststore; } + }); } @@ -83,9 +84,13 @@ public class SslConfig { return (tomcat) -> tomcat.setSsl(new Ssl() { @Override public String getKeyPassword() { - String password = PassDecoder.decode(env.getProperty("server.ssl.key-password"), + return PassDecoder.decode(env.getProperty("server.ssl.key-password"), env.getProperty("clamp.config.keyFile")); - return password; + } + + @Override + public String getKeyAlias() { + return env.getProperty("server.ssl.key-alias"); } }); } -- cgit 1.2.3-korg