diff options
author | 2021-02-08 14:36:11 +0100 | |
---|---|---|
committer | 2021-02-08 14:33:35 +0000 | |
commit | da0eb22129cb541bcb705f564c546089654acea3 (patch) | |
tree | b253cc1dc6838ec8adeea93e913ce36b5213ba32 /src/main/java/org | |
parent | 7ca759eb2ab1d2a68fe3e8fc87de36bbb14eb09f (diff) |
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 <sebastien.determe@intl.att.com>
Change-Id: I11c2ff5aac8a99c7a2b7e676d6c11bbc861a1de4
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
(cherry picked from commit d2178bc9f7d6c06f60a3a8afecd83e428d84cd78)
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java | 11 |
1 files changed, 8 insertions, 3 deletions
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"); } }); } |