Commit 0720d504 authored by filatov's avatar filatov
Browse files

IS_DSRC => DSRC

various errors
parent 192caced
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@


module LibItsCommon_ASN1_ISDSRC_NamedNumbers {
module LibItsCommon_ASN1_ISDSRC_NamedNumbers {


import from IS_DSRC language "ASN.1:1997" all;
import from DSRC language "ASN.1:1997" all;


  group IS_DSCR_constants {
  group IS_DSCR_constants {
    group LaneParameter_constants {
    group LaneParameter_constants {
+3 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,9 @@ module LibItsDcc_TestSystem {
         * @desc Check Port used for intercomponent exchange of data to check
         * @desc Check Port used for intercomponent exchange of data to check
         */
         */
        type port CheckPort message {
        type port CheckPort message {
            inout all;
//FIXME RGY "all" is not supported by Titan in port message lists; only integers are sent and received via checkPort-s;
//            inout all;
            inout integer;
        }
        }
        
        
    } // end portDefinitions
    } // end portDefinitions
+1 −1
Original line number Original line Diff line number Diff line
@@ -2784,7 +2784,7 @@ module LibItsGeoNetworking_Functions {
                        f_HashedId3FromHashedId8(
                        f_HashedId3FromHashedId8(
                            valueof(p_digest)
                            valueof(p_digest)
                    )) 
                    )) 
                } 
                },
                ""
                ""
            );
            );
                
                
+16 −9
Original line number Original line Diff line number Diff line
@@ -24,7 +24,8 @@ module LibItsSecurity_Functions {
    import from LibItsSecurity_Templates all;
    import from LibItsSecurity_Templates all;
    import from LibItsSecurity_Pixits all;
    import from LibItsSecurity_Pixits all;
    import from LibItsSecurity_TestSystem all;
    import from LibItsSecurity_TestSystem all;
    import from LibItsSecurity_EncdecDeclarations all;
//FIXME(DF) UNUSED
//    import from LibItsSecurity_EncdecDeclarations all;
    
    
    group helpersFunctions {
    group helpersFunctions {
        
        
@@ -191,7 +192,8 @@ module LibItsSecurity_Functions {
                
                
                // Local variables
                // Local variables
                var octetstring v_secPayload, v_signature;
                var octetstring v_secPayload, v_signature;
                var Oct32 v_hash;
//FIXME(DF) UNUSED
//                var Oct32 v_hash;
                var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
                var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
                var integer i, j, k, n;
                var integer i, j, k, n;
                var HeaderFields v_headerFields := {};
                var HeaderFields v_headerFields := {};
@@ -263,7 +265,7 @@ module LibItsSecurity_Functions {
                        return false;
                        return false;
                    }
                    }
                } else {
                } else {
                    if(not f_readSigningKey(valueof(cc_taCert_A), v_privateKey)){
                    if(not f_readSigningKey(cc_taCert_A, v_privateKey)){
                        return false;
                        return false;
                    }
                    }
                }
                }
@@ -319,7 +321,8 @@ module LibItsSecurity_Functions {
                
                
                // Local variables
                // Local variables
                var octetstring v_secPayload, v_signature;
                var octetstring v_secPayload, v_signature;
                var Oct32 v_hash;
// FIXME(DF)UNUSED
//                var Oct32 v_hash;
                var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
                var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
                var integer i, j, k, n;
                var integer i, j, k, n;
                var HeaderFields v_headerFields := {};
                var HeaderFields v_headerFields := {};
@@ -405,7 +408,7 @@ module LibItsSecurity_Functions {
                        return false;
                        return false;
                    }
                    }
                } else {
                } else {
                    if(not f_readSigningKey(valueof(cc_taCert_A), v_privateKey)){
                    if(not f_readSigningKey(cc_taCert_A, v_privateKey)){
                        return false;
                        return false;
                    }
                    }
                }
                }
@@ -948,7 +951,8 @@ module LibItsSecurity_Functions {
                                           in charstring p_certificateName
                                           in charstring p_certificateName
            ) runs on ItsSecurityBaseComponent return HashedId8 {
            ) runs on ItsSecurityBaseComponent return HashedId8 {
                // Local variables
                // Local variables
                var Certificate v_atCertificate;
// FIXME (DF) UNUSED
//                var Certificate v_atCertificate;
                var HashedId8   v_hashedId8 := '0000000000000000'O;
                var HashedId8   v_hashedId8 := '0000000000000000'O;
                
                
                // Sanity check
                // Sanity check
@@ -1044,7 +1048,8 @@ module LibItsSecurity_Functions {
                // Local variables
                // Local variables
                var octetstring v_secPayload;
                var octetstring v_secPayload;
                var octetstring v_signedData;
                var octetstring v_signedData;
                var Oct32 v_hash;
// FIXME (DF) UNUSED
//                var Oct32 v_hash;
                var integer v_counter;
                var integer v_counter;
                var boolean v_result := false;
                var boolean v_result := false;
                var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
                var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
@@ -1203,7 +1208,8 @@ module LibItsSecurity_Functions {
            function f_loadCertificates(
            function f_loadCertificates(
                                        in charstring p_configId
                                        in charstring p_configId
            ) runs on ItsSecurityBaseComponent return boolean {
            ) runs on ItsSecurityBaseComponent return boolean {
                var boolean v_result;
// FIXME (DF) UNUSED
//                var boolean v_result;
                
                
                // Setup certificates memory cache
                // Setup certificates memory cache
                if (fx_loadCertificates(PX_CERTIFICATE_POOL_PATH, p_configId) == true) {
                if (fx_loadCertificates(PX_CERTIFICATE_POOL_PATH, p_configId) == true) {
@@ -1848,7 +1854,8 @@ module LibItsSecurity_Functions {
                                                               in template (value) RectangularRegion p_rectangular_region,
                                                               in template (value) RectangularRegion p_rectangular_region,
                                                               out PolygonalRegion p_region
                                                               out PolygonalRegion p_region
        ) return boolean {
        ) return boolean {
            var integer v_counter := 0;
// FIXME (DF) UNUSED
//            var integer v_counter := 0;
            
            
            // Convert rectangular regions to polygons and check polygons
            // Convert rectangular regions to polygons and check polygons
            p_region[0] := valueof(p_rectangular_region.northwest);
            p_region[0] := valueof(p_rectangular_region.northwest);
+1 −1
Original line number Original line Diff line number Diff line
module LibItsSremSsem_EncdecDeclarations {
module LibItsSremSsem_EncdecDeclarations {


import from IS_DSRC all;
import from DSRC all;


external function fx_enc_SSM (SignalStatusMessage p) return octetstring
external function fx_enc_SSM (SignalStatusMessage p) return octetstring
    with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}
    with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}