Merge with TTworkbench verion

ttcn/CAM/LibItsCam_Pics.ttcn

@@ -121,7 +121,7 @@ module LibItsCam_Pics {
       }
 
       /**
-       * @desc Does radio communication use G5?
+       * @desc Does radio communication use ITS-G5 or LTE-V2X?
        * @see  ETSI TS 102 868-1 Table A.3
        */
       modulepar RadioAccess PICS_RADIO_COMM := e_its_g5;

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

 /**
- *  @author     ETSI / STF405 / STF449 / STF484 / STF517
+ *  @author     ETSI / STF405 / STF449 / STF484 / STF517 / STF 538
  *  @version    $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn $
  *              $Id: LibItsGeoNetworking_Functions.ttcn 1329 2017-02-21 14:48:18Z berge $
  *  @desc       Module containing functions for GeoNetworking
@@ -2805,7 +2805,7 @@ module LibItsGeoNetworking_Functions {
                                                      m_geoNwSecPdu(
                                                                    v_gnNonSecuredPacket,
                                                                    v_securedMessage
-                                                                   ) // End of template m_geoNwSecPdu
+                )
                                                      )); // End of template m_geoNwReq_linkLayerBroadcast
             
       // Send Message

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

@@ -388,7 +388,7 @@ module LibItsMapemSpatem_Templates {
                 /**
                  * @desc    Receive template for MAPEM Message
                  */
-                template (value) MapData m_mapem(
+                template (omit) MapData m_mapem(
                                                  in template (value) MsgCount p_msgIssueRevision,
                                                  in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
                                                  in template (omit) RoadSegmentList p_roadSegments := omit
@@ -577,7 +577,7 @@ module LibItsMapemSpatem_Templates {
             
                 template (value) IntersectionStateList m_intersections := { m_intersection };
                 
-                template (omit) IntersectionState m_intersection := {
+                template (value) IntersectionState m_intersection := {
                     name                := omit,                                                // Human readable name for intersection to be used only in debug mode
                     id                  := m_intersectionReferenceID,                           // A globally unique value set, consisting of a  regionID and 
                                                                                                 // intersection ID assignment provides a unique mapping to the intersection MAP in question which provides complete location and approach/move/lane data

ttcn/Pki/LibItsPki_Functions.ttcn

@@ -1725,6 +1725,7 @@ module LibItsPki_Functions {
       p_ec_certificate := valueof(v_cert);
       return true;
     } // End of function f_generate_ec_certificate
+    
     function f_generate_ec_certificate_for_inner_ec_response(
                                                              in InnerEcRequest p_inner_ec_request,
                                                              in octetstring p_private_key,
@@ -2009,7 +2010,7 @@ module LibItsPki_Functions {
                                                                     v_public_verification_key
                                                                     ),
                                                        m_certificateSubjectAttributes_id_name(
-                                                                                              oct2char(PICS_ITS_S_CANONICAL_ID) & int2str(f_getCurrentTime()), // ETSI TS 103 097 V1.3.1 (2017-10) Clause 7.2.2 Enrolment credential
+                                                                                              oct2char(PICS_ITS_S_CANONICAL_ID) & int2str(f_getCurrentTime()), // ETSI TS  103 097 Clause 7.2.2 Enrolment credential 
                                                                                               { // ETSI TS 102 965 Table A.1: ETSI ITS standardized ITS-AIDs
                                                                                                 valueof(m_appPermissions(c_its_aid_SCR, { bitmapSsp := PX_INNER_EC_CERTFICATE_BITMAP_SSP_SCR }))
                                                                                                 },
@@ -2034,7 +2035,7 @@ module LibItsPki_Functions {
                                                        m_publicKeys(
                                                                     v_public_verification_key
                                                                     ),
-                                                       m_certificateSubjectAttributes_id_omit( // ETSI TS 103 097 V1.3.1 (2017-10) Clause 7.2.2 Enrolment credential
+                                                       m_certificateSubjectAttributes_id_omit( // ETSI TS  103 097 Clause 7.2.2 Enrolment credential 
                                                                                               { // ETSI TS 102 965 Table A.1: ETSI ITS standardized ITS-AIDs
                                                                                                 valueof(m_appPermissions(c_its_aid_SCR, { bitmapSsp := PX_INNER_EC_CERTFICATE_BITMAP_SSP_SCR }))
                                                                                                 },
@@ -2386,7 +2387,7 @@ module LibItsPki_Functions {
                                                                                 m_certificate_subject_attributes( // FIXME Review subjectPermissions
                                                                                                                  v_appPermissions,
                                                                                                                  p_ec_certificate.toBeSigned.certRequestPermissions,
-                                                                                                                 { none_ := NULL },//p_ec_certificate.toBeSigned.id,
+                                                                                                                 -,//{ none_ := NULL },//p_ec_certificate.toBeSigned.id,
                                                                                                                  p_ec_certificate.toBeSigned.validityPeriod,
                                                                                                                  p_ec_certificate.toBeSigned.region,
                                                                                                                  p_ec_certificate.toBeSigned.assuranceLevel
@@ -3224,6 +3225,7 @@ module LibItsPki_Functions {
             log("f_verify_rca_ctl_response_message: Invalid nextUpdate value: compared values=", p_to_be_signed_rca_ctl.nextUpdate, "/", v_time);
             return false;
           }
+          // TODO Verify RCA certificate & signature
         }
       }
 
@@ -3413,7 +3415,7 @@ module LibItsPki_Functions {
         if (match(p_ctl_entry.tlm, mw_tlm_entry(mw_etsiTs103097Certificate)) == false) {
           return false;
         } else {
-          // TODO Verify selsigned certificate
+          // TODO Verify RCA certificate & signature
         }
       } else if (ischosen(p_ctl_entry.dc)) {
         if (match(p_ctl_entry.dc, mw_dc_entry) == false) {
@@ -4254,7 +4256,7 @@ module LibItsPki_Functions {
       v_msg := bit2oct(encvalue(p_ieee1609dot2_encrypted_and_signed_data));
       log("f_verify_pki_request_message: Encoded request: ", v_msg);
       p_request_hash := substr(f_hashWithSha256(v_msg), 0, 16);
-      log("f_verify_pki_request_message: v_request_hash= ", p_request_hash);
+      log("f_verify_pki_request_message: p_request_hash= ", p_request_hash);
  
       // 2. Decrypt the InnerEcRequest
       log("f_verify_pki_request_message: p_private_enc_key= ", p_private_enc_key);

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn

@@ -147,6 +147,8 @@ module LibItsSecurity_TypesAndValues {
         const charstring cc_taCert_CC_AA := "CERT_IUT_CC_AA";
         const charstring cc_iutCert_A    := "CERT_IUT_A_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
         const charstring cc_iutCert_A_AA := "CERT_IUT_A_AA"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - NistP256*/
+        const charstring cc_iutCert_A_N := "CERT_IUT_A_N_AT";
+        const charstring cc_iutCert_A_B_N := "CERT_IUT_A_B_N_AT";
         const charstring cc_iutCert_A_B  := "CERT_IUT_A_B_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - BrainpoolP256r1*/
         const charstring cc_iutCert_A_B3 := "CERT_IUT_A_B3_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - BrainpoolP384r1*/
         const charstring cc_iutCert_B    := "CERT_IUT_B_AT"; /** Default certificate, with circular region, to be used when secured messages are sent from TA to IUT */