From 44dcafd141aae9d8d499062c06dd02f7f9d2b1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20M=C3=BCltin?= Date: Thu, 14 Apr 2016 19:55:04 +0200 Subject: [PATCH] bugfix for signing message elements of CertificateInstallationRes/CertificateUpdateRes --- .../secc/backend/DummyBackendInterface.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/backend/DummyBackendInterface.java b/RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/backend/DummyBackendInterface.java index 7de1ed2..431e705 100644 --- a/RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/backend/DummyBackendInterface.java +++ b/RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/backend/DummyBackendInterface.java @@ -183,23 +183,26 @@ public class DummyBackendInterface implements IBackendInterface { KeyStore keyStore = SecurityUtils.getPKCS12KeyStore( "./contractCert.p12", GlobalValues.PASSPHRASE_FOR_CERTIFICATES_AND_KEYS.toString()); - return SecurityUtils.getPrivateKey(keyStore); + ECPrivateKey privateKey = SecurityUtils.getPrivateKey(keyStore); + + if (privateKey == null) + getLogger().error("No private key available from contract certificate keystore"); + + return privateKey; } @Override public ECPrivateKey getSAProvisioningCertificatePrivateKey() { - Path pathToPrivateKey = FileSystems.getDefault().getPath("./MOSub2_ISO-UG_2016-1_key.bin"); - byte[] moSub2PrivateKey = null; + KeyStore keyStore = SecurityUtils.getPKCS12KeyStore( + "./provServiceCert.p12", + GlobalValues.PASSPHRASE_FOR_CERTIFICATES_AND_KEYS.toString()); + ECPrivateKey privateKey = SecurityUtils.getPrivateKey(keyStore); - try { - moSub2PrivateKey = Files.readAllBytes(pathToPrivateKey); - } catch (IOException e) { - getLogger().error("IOException occurred while trying to read MOSub2 private key for signing sales tariff"); - return null; - } - - return SecurityUtils.getPrivateKey(moSub2PrivateKey); + if (privateKey == null) + getLogger().error("No private key available from provisioning service keystore"); + + return privateKey; }