Commit 19b869d8 authored by garciay's avatar garciay
Browse files

Bug fixed in signature

parent c95290ac

javasrc/adapter/org/etsi/its/adapter/ports/GnPort.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -488,11 +488,8 @@ public class GnPort extends ProtocolPort implements Runnable, IEthernetSpecific 
        

        

        byte[] toBeSent = null;

        byte[] toBeSent = null;

        try {

        try {

            // Calculate the hash

            // Signed the data

            byte[] hash = CryptoLib.hashWithSha256(toBeSignedData);

            byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(toBeSignedData, management.getSigningPrivateKey());

            //TERFactory.getInstance().logDebug("GnPort.createSecuredMessage: hash=" + ByteHelper.byteArrayToString(hash));

            // Signed the hash

            byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(hash, management.getSigningPrivateKey());

            //TERFactory.getInstance().logDebug("GnPort.createSecuredMessage: signatureBytes=" + ByteHelper.byteArrayToString(signatureBytes));

            //TERFactory.getInstance().logDebug("GnPort.createSecuredMessage: signatureBytes=" + ByteHelper.byteArrayToString(signatureBytes));

            // Add signature

            // Add signature

            toBeSent  = ByteHelper.concat(

            toBeSent  = ByteHelper.concat(

javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -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 {

    private void signSecuredMessage(final ByteArrayOutputStream p_toBeSignedData, final ByteArrayOutputStream p_securedMessage) throws Exception {

//        TERFactory.getInstance().logDebug("UpperTesterPort.signSecuredMessage: toBeSignedData: " + ByteHelper.byteArrayToString(p_toBeSignedData.toByteArray()));

//        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;

        byte[] securedBeaconHeader = null;

        // Signed the hash

        // Signed the data

        byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(hash, new BigInteger(_signingPrivateKey.toByteArray()));

        byte[] signatureBytes = CryptoLib.signWithEcdsaNistp256WithSha256(p_toBeSignedData.toByteArray(), new BigInteger(_signingPrivateKey.toByteArray()));

//        TERFactory.getInstance().logDebug("UpperTesterPort.signSecuredMessage: signatureBytes=" + ByteHelper.byteArrayToString(signatureBytes));

//        TERFactory.getInstance().logDebug("UpperTesterPort.signSecuredMessage: signatureBytes=" + ByteHelper.byteArrayToString(signatureBytes));

        // Add signature

        // Add signature

        securedBeaconHeader = ByteHelper.concat(

        securedBeaconHeader = ByteHelper.concat(