Bug fixed in GeoNetworking codec

ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc

@@ -99,10 +99,8 @@ int geonetworking_codec::encode_ (const Base_Type& type, const TTCN_Typedescript
         return -1;
       }
       // Store playload length and continue encoding
-      if (p.lengthof() != 0) {
-        _ec.set_length(p.lengthof());
-        loggers::get_instance().log("geonetworking_codec::encode_: Storing payload length %d for %s", _ec.get_length(), p.get_descriptor()->name);
-      }
+      _ec.set_length(p.lengthof());
+      loggers::get_instance().log("geonetworking_codec::encode_: Storing payload length %d for %s", _ec.get_length(), p.get_descriptor()->name);
     }
   } else if (std::string(field_descriptor.name).compare("@EtsiTs103097Module.EtsiTs103097Data") == 0) {
     const EtsiTs103097Module::EtsiTs103097Data& ieee_1609dot2_data = static_cast<const EtsiTs103097Module::EtsiTs103097Data&>(type);

scripts/merge_its_project.bash

@@ -206,7 +206,7 @@ done
 TTCN_3_LIB_LIST='Common BTP CAM DENM GeoNetworking Ipv6OverGeoNetworking Security'
 for i in ${TTCN_3_LIB_LIST}
 do
-    LIST_TTCN_FILES=`find ${TTCN_3_ORG_PATH}/LibIts/$i -name "*.ttcn" -type f`
+    LIST_TTCN_FILES=`find ${TTCN_3_ORG_PATH}/LibIts/ttcn/$i -name "*.ttcn" -type f`
     for j in ${LIST_TTCN_FILES}
     do
 	      BN=`basename $j`

ttcn/TestCodec/TestCodec_Certificates.ttcn

@@ -757,9 +757,9 @@ module TestCodec_Certificates {
   } // End of testcase tc_at_certificate_sha256_3
    
   testcase tc_certificate_asn1c_1() runs on TCType system TCType { // CERT_IUT_A_RCA
-    const octetstring c_cert := '8003008100288300000000001874e3808466a8c001012080010780012482080301ffff0301ffff800125820a0401ffffff0401ffffff800189820a0401ffffff0401ffffff80018a820a0401ffffff0401ffffff80018b820a0401ffffff0401ffffff80018c820a0401ffffff0401ffffff00018d00808083f350dd047032fa9ef216c2260a5f2b4008e6805ad1ff957b62f83d4d91a2ce2180805a6dbfa94e044191b090775fa7e7e6b2991bdb187e08580fe15fe95bc0901f1bf801e9f15b9a5b2c54f1d2fc89bf288a8fc3a3bce483f3ba37cb17ef5d03d746'O; // CERT_IUT_A_RCA.oer
+    const octetstring c_cert := '8003008100288300000000001874e3808466a8c001012080010e80012482080301ffff0301ffff800125820a0401ffffff0401ffffff800189820a0401ffffff0401ffffff80018a820a0401ffffff0401ffffff80018b820a0401ffffff0401ffffff80018c820a0401ffffff0401ffffff00018d00016000016100016200016300016400016500016600808083b348d43d8d280012d2b3221d530592828990de31a13ba005c340191f748d7fae8080138350df39556a1a80fb46414def254791af2a3b30adf662478c50e7cca1e5ab34c0e27366ecdbd30bf4adc431201f755ec4536303a2812a607cf8ce9ed829dd'O; // CERT_IUT_A_RCA.oer
     var EtsiTs103097Certificate v_cert_dec;
-    var Oct32 v_private_key := '004d869e06e6d00cc6c82e2f3c65ef1e348fc473d3d03708a4d50e51a995fe4e'O; // CERT_IUT_A_RCA.vkey
+    var Oct32 v_private_key := '4e22da40115d1f7caccf38bee1b3cd32f08405d8b85c948a2b11b88436387893'O; // CERT_IUT_A_RCA.vkey
     var bitstring v_enc_msg := oct2bit(c_cert);
     var integer v_compressedMode;
     var Oct32 v_publicKeyCompressed := int2oct(0, 32);
@@ -846,6 +846,34 @@ module TestCodec_Certificates {
               {
               psid := 141,
               sspRange := omit
+              },
+              {
+              psid := 96,
+              sspRange := omit
+              },
+              {
+              psid := 97,
+              sspRange := omit
+              },
+              {
+              psid := 98,
+              sspRange := omit
+              },
+              {
+              psid := 99,
+              sspRange := omit
+              },
+              {
+              psid := 100,
+              sspRange := omit
+              },
+              {
+              psid := 101,
+              sspRange := omit
+              },
+              {
+              psid := 102,
+              sspRange := omit
               }
             }
           },
@@ -860,7 +888,7 @@ module TestCodec_Certificates {
       verifyKeyIndicator := {
         verificationKey := {
           ecdsaNistP256 := {
-            compressed_y_1 := 'F350DD047032FA9EF216C2260A5F2B4008E6805AD1FF957B62F83D4D91A2CE21'O
+            compressed_y_1 := 'B348D43D8D280012D2B3221D530592828990DE31A13BA005C340191F748D7FAE'O
           }
         }
       }
@@ -868,9 +896,9 @@ module TestCodec_Certificates {
     signature_ := {
       ecdsaNistP256Signature := {
         rSig := {
-          x_only := '5A6DBFA94E044191B090775FA7E7E6B2991BDB187E08580FE15FE95BC0901F1B'O
+          x_only := '138350DF39556A1A80FB46414DEF254791AF2A3B30ADF662478C50E7CCA1E5AB'O
         },
-        sSig := 'F801E9F15B9A5B2C54F1D2FC89BF288A8FC3A3BCE483F3BA37CB17EF5D03D746'O
+        sSig := '34C0E27366ECDBD30BF4ADC431201F755EC4536303A2812A607CF8CE9ED829DD'O
       }
     }
     };