From 19b869d8f903d8ba055cd4185b57a021c4b054cd Mon Sep 17 00:00:00 2001 From: garciay Date: Wed, 2 Nov 2016 07:48:35 +0000 Subject: [PATCH] Bug fixed in signature --- javasrc/adapter/org/etsi/its/adapter/ports/GnPort.java | 7 ++----- .../org/etsi/its/adapter/ports/UpperTesterPort.java | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/javasrc/adapter/org/etsi/its/adapter/ports/GnPort.java b/javasrc/adapter/org/etsi/its/adapter/ports/GnPort.java index 220350b24..af8e5054a 100644 --- a/javasrc/adapter/org/etsi/its/adapter/ports/GnPort.java +++ b/javasrc/adapter/org/etsi/its/adapter/ports/GnPort.java @@ -488,11 +488,8 @@ public class GnPort extends ProtocolPort implements Runnable, IEthernetSpecific byte[] toBeSent = null; try { - // Calculate the hash - byte[] hash = CryptoLib.hashWithSha256(toBeSignedData); - //TERFactory.getInstance().logDebug("GnPort.createSecuredMessage: hash=" + ByteHelper.byteArrayToString(hash)); - // Signed the hash - byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(hash, management.getSigningPrivateKey()); + // Signed the data + byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(toBeSignedData, management.getSigningPrivateKey()); //TERFactory.getInstance().logDebug("GnPort.createSecuredMessage: signatureBytes=" + ByteHelper.byteArrayToString(signatureBytes)); // Add signature toBeSent = ByteHelper.concat( diff --git a/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java b/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java index f123530b4..7c0432c4b 100644 --- a/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java +++ b/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java @@ -621,12 +621,9 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { private void signSecuredMessage(final ByteArrayOutputStream p_toBeSignedData, final ByteArrayOutputStream p_securedMessage) throws Exception { // TERFactory.getInstance().logDebug("UpperTesterPort.signSecuredMessage: toBeSignedData: " + ByteHelper.byteArrayToString(p_toBeSignedData.toByteArray())); - // Calculate the hash - byte[] hash = CryptoLib.hashWithSha256(p_toBeSignedData.toByteArray()); -// TERFactory.getInstance().logDebug("UpperTesterPort.signSecuredMessage: hash=" + ByteHelper.byteArrayToString(hash)); byte[] securedBeaconHeader = null; - // Signed the hash - byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(hash, new BigInteger(_signingPrivateKey.toByteArray())); + // Signed the data + byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(p_toBeSignedData.toByteArray(), new BigInteger(_signingPrivateKey.toByteArray())); // TERFactory.getInstance().logDebug("UpperTesterPort.signSecuredMessage: signatureBytes=" + ByteHelper.byteArrayToString(signatureBytes)); // Add signature securedBeaconHeader = ByteHelper.concat( -- GitLab