Commit b4b3bc03 authored by garciay's avatar garciay
Browse files

Bug fixed in ItsAid decoding 

Remove sysout
parent 59804da6

javasrc/adapter/org/etsi/its/adapter/layers/CommsigniaLayer.java

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ public class CommsigniaLayer extends Layer implements IEthernetSpecific { 
        try {

            itsApplication.connect(1000);

            itsApplication.registerBlocking();

            DeviceInfoResponse deviceInfoResponse = itsApplication.requestDeviceInfoBlocking();

            System.out.println(deviceInfoResponse);

            itsApplication.setFacilityModuleStatus(FacilityModule.BSM, false);

            itsApplication.setFacilityModuleStatus(FacilityModule.CAM, false);

            itsApplication. gnBindBlocking(BTPType.NONE, 65535);

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

+0 −1
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ public class GnPort extends ProtocolPort implements Runnable, IEthernetSpecific 
        }

        

//        ByteHelper.dump("GnPort.send", message);

        //System.out.println("\n\n");

        return send(message, params);

    }

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

+12 −12
Original line number Diff line number Diff line
@@ -100,13 +100,13 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
            _certificate = new ByteArrayOutputStream();

            CertificatesIOFactory.getInstance().loadCertificates(_utSecuredRootPath, _utSecuredConfiId);

            if (CertificatesIOFactory.getInstance().readCertificate(CertificateId, _certificate)) {

//                System.out.println("UpperTesterPort.UpperTesterPort: _certificate=" + ByteHelper.byteArrayToString(_certificate.toByteArray()));

//                TERFactory.getInstance().logDebug("UpperTesterPort.UpperTesterPort: _certificate=" + ByteHelper.byteArrayToString(_certificate.toByteArray()));

                _hashedId8 = new ByteArrayOutputStream();

                _signingPrivateKey = new ByteArrayOutputStream();

                CertificatesIOFactory.getInstance().readCertificateDigest(CertificateId, _hashedId8);

//                System.out.println("UpperTesterPort.UpperTesterPort: _hashedId8=" + ByteHelper.byteArrayToString(_hashedId8.toByteArray()));

//                TERFactory.getInstance().logDebug("UpperTesterPort.UpperTesterPort: _hashedId8=" + ByteHelper.byteArrayToString(_hashedId8.toByteArray()));

                CertificatesIOFactory.getInstance().readSigningKey(CertificateId, _signingPrivateKey);

//                System.out.println("UpperTesterPort.UpperTesterPort: _signingPrivateKey=" + ByteHelper.byteArrayToString(_signingPrivateKey.toByteArray()));

//                TERFactory.getInstance().logDebug("UpperTesterPort.UpperTesterPort: _signingPrivateKey=" + ByteHelper.byteArrayToString(_signingPrivateKey.toByteArray()));

                

                _isSecuredMode = true;

            }
@@ -561,20 +561,20 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
            16, // Set position at the beginning of the public keys

            32

        );

//        System.out.println("UpperTesterPort.DispatchMessage: aaSigningPublicKeyX:" + ByteHelper.byteArrayToString(aaSigningPublicKeyX));

//        TERFactory.getInstance().logDebug("UpperTesterPort.DispatchMessage: aaSigningPublicKeyX:" + ByteHelper.byteArrayToString(aaSigningPublicKeyX));

        byte[] aaSigningPublicKeyY = ByteHelper.extract(

            _certificate.toByteArray(),

            16 + 32,

            32

        );

//        System.out.println("UpperTesterPort.DispatchMessage: aaSigningPublicKeyY:" + ByteHelper.byteArrayToString(aaSigningPublicKeyY));

//        TERFactory.getInstance().logDebug("UpperTesterPort.DispatchMessage: aaSigningPublicKeyY:" + ByteHelper.byteArrayToString(aaSigningPublicKeyY));

        

        // Build the generation time value

        byte[] generationTime = ByteHelper.longToByteArray(

            System.currentTimeMillis(),

            Long.SIZE / Byte.SIZE

        ); // In microseconds

//        System.out.println("UpperTesterPort.buildToBeSignedData: generationTime=" + ByteHelper.byteArrayToString(generationTime));

//        TERFactory.getInstance().logDebug("UpperTesterPort.buildToBeSignedData: generationTime=" + ByteHelper.byteArrayToString(generationTime));

        byte[] headersField = ByteHelper.concat(

            ByteHelper.concat(                                // SecuredMessage HeaderFields

                signerInfo,                                   // signerInfo
@@ -600,7 +600,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
            b

        );

        byte[] headersFieldLength = SecurityHelper.getInstance().size2tls(headersField.length);

//        System.out.println("UpperTesterPort.buildToBeSignedData: headersField=" + ByteHelper.byteArrayToString(headersField));

//        TERFactory.getInstance().logDebug("UpperTesterPort.buildToBeSignedData: headersField=" + ByteHelper.byteArrayToString(headersField));

        byte[] payload = p_securedData.toByteArray();

        byte[] toBeSignedData = ByteHelper.concat(

            new byte[] {                                      // SecuredMessage version
@@ -616,20 +616,20 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
            new byte[] { (byte)0x43 },                        // Signature length

            new byte[] { (byte)0x01 }                         // Signature

        );

//        System.out.println("UpperTesterPort.buildToBeSignedData: toBeSignedData=" + ByteHelper.byteArrayToString(toBeSignedData));

//        TERFactory.getInstance().logDebug("UpperTesterPort.buildToBeSignedData: toBeSignedData=" + ByteHelper.byteArrayToString(toBeSignedData));

        

        p_toBeSignedData.write(toBeSignedData);

    }

    

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

//        System.out.println("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());

//        System.out.println("UpperTesterPort.signSecuredMessage: hash=" + ByteHelper.byteArrayToString(hash));

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

        byte[] securedBeaconHeader = null;

        // Signed the hash

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

//        System.out.println("UpperTesterPort.signSecuredMessage: signatureBytes=" + ByteHelper.byteArrayToString(signatureBytes));

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

        // Add signature

        securedBeaconHeader = ByteHelper.concat(

            p_toBeSignedData.toByteArray(),
@@ -640,7 +640,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
            ByteHelper.extract(signatureBytes, 2, signatureBytes.length - 2)

        );

        p_securedMessage.write(securedBeaconHeader);

//        System.out.println("<<< UpperTesterPort.signSecuredMessage: sendBeacon: " + ByteHelper.byteArrayToString(p_securedMessage.toByteArray()));

//        TERFactory.getInstance().logDebug("<<< UpperTesterPort.signSecuredMessage: sendBeacon: " + ByteHelper.byteArrayToString(p_securedMessage.toByteArray()));

    }

    

} // End of class UpperTesterPort

javasrc/certificatesio/org/etsi/certificates/io/CertificatesIO.java

+8 −8
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class CertificatesIO implements ICertificatesIO { 
     */

    @Override

    public boolean readCertificate(final String key, final ByteArrayOutputStream certificate) {

//        System.out.println(">>> CertificatesIO.readCertificate: " + key);

//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key);

        

        String certKey;

        if (_cachedReverseCertificatesDigest.containsKey(key)) {
@@ -173,7 +173,7 @@ public class CertificatesIO implements ICertificatesIO { 
    

    @Override

    public boolean readCertificateDigest(final String certificateId, final ByteArrayOutputStream digest) {

//        System.out.println(">>> CertificatesIO.readCertificateDigest: " + certificateId);

//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId);

        

        // Sanity check

        if (!_cachedCertificatesDigest.containsKey(certificateId)) {
@@ -199,7 +199,7 @@ public class CertificatesIO implements ICertificatesIO { 
     */

    @Override

    public boolean readSigningKey(final String keyName, final ByteArrayOutputStream key) { 

//        System.out.println(">>> CertificatesIO.readSigningKey: " + keyName);

//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName);

        

        try {

            String certKey;
@@ -305,11 +305,11 @@ public class CertificatesIO implements ICertificatesIO { 
            return;

        }

        _cachedCertificatesDigest.put(certName, bytes);

//        System.out.println("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);

//        TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);

    }

    

    private void addCertItem(final File p_certFile)  throws FileNotFoundException, IOException {

//        System.out.println(">>> CertificatesIO.addItem: " + p_certFile);

//        TERFactory.getInstance().logDebug(">>> CertificatesIO.addItem: " + p_certFile);

        

        // Load the keys file name

        String filename = p_certFile.getName();
@@ -322,14 +322,14 @@ public class CertificatesIO implements ICertificatesIO { 
        fsKeys.close();

        bytes = ByteHelper.hexStringToByteArray(new String(bytes));

        _cachedCertificates.put(certName, bytes);

//        System.out.println("CertificatesIO.addItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));

//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));

        

        // calculate digest

        bytes = calculateDigestFromCertificate(bytes);

        _cachedCertificatesDigest.put(certName, bytes);

//        System.out.println("CertificatesIO.addItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);

//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);

        _cachedReverseCertificatesDigest.put(ByteHelper.byteArrayToString(bytes), certName);

//        System.out.println("CertificatesIO.addItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);

//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);

        

        // Load Private Keys

        filename = p_certFile.getPath();

javasrc/codec/org/etsi/ttcn/codec/CodecBuffer.java

+2 −2
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ public class CodecBuffer { 
     * @see     setMarkers()

     */

    public void runCallbacks() {

//        System.out.println("Running callbacks...");

//        TERFactory.getInstance().logDebug("Running callbacks...");

        for(Map.Entry<String, Marker> entry : markers.entrySet()) {

            String key = entry.getKey();

//            System.out.println("Running callback: " + key);

//            TERFactory.getInstance().logDebug("Running callback: " + key);

            Marker marker = entry.getValue();

            IMarkerCallback callback = marker.getCallback();

            if(callback != null) {