Implement additional BI test purposes proposal

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

@@ -1763,7 +1763,7 @@ module LibItsGeoNetworking_Templates {
             }
             
             function f_getDelta15(Int32 p_value, integer p_delta) return template (present) Int15 {
-              log(">>> f_getDelta15: ", p_value, ", ", p_delta); // FIXME To be removed when issue https://forge.etsi.org/rep/ITS/ITS/issues/13 will be clause
+              log(">>> f_getDelta15: ", p_value, ", ", p_delta);
               
                 if (p_value == c_int15Min) {
                     return (p_value .. p_value+p_delta);

ttcn/Http/LibItsHttp_Templates.ttcn

@@ -141,7 +141,7 @@ module LibItsHttp_Templates {
           version_major := 1,
           version_minor := 1,
           statuscode    := 200,
-          statustext    := "OK",
+          statustext    := ?,
           header        := p_header,
           body          := p_body
       } // End of template mw_http_response_ok

ttcn/Pki/LibItsPki_Pics.ttcn

@@ -35,20 +35,30 @@ module LibItsPki_Pics {
    */
   modulepar boolean PICS_SECPKI_CRL := false;
   
+  /**
+   * @desc Do the Authorization Request use SignedWithPop mechanism?
+   */
+  modulepar boolean PICS_PKI_AUTH_POP := true;
+
   /**
    * @desc Certificate used by the IUT acting as ITS-S
    */
-  modulepar charstring PICS_IUT_CERTIFICATE_ID := "CERT_IUT_A_EA";
+  modulepar charstring PICS_IUT_CERTIFICATE_ID := "CERT_IUT_A_AT";
 
   /**
    * @desc Certificate used by the IUT acting as EA
    */
-  modulepar charstring PICS_IUT_EA_CERTIFICATE_ID := "CERT_IUT_A__EA_EA";
+  modulepar charstring PICS_IUT_EA_CERTIFICATE_ID := "CERT_IUT_A_EA";
 
   /**
    * @desc Certificate used by the IUT acting as AA
    */
-  modulepar charstring PICS_IUT_AA_CERTIFICATE_ID := "CERT_IUT_A_AA_EA";
+  modulepar charstring PICS_IUT_AA_CERTIFICATE_ID := "CERT_IUT_A_AA";
+
+  /**
+   * @desc Certificate used by the IUT acting as AA
+   */
+  modulepar charstring PICS_IUT_CA_CERTIFICATE_ID := "CERT_IUT_A_RCA";
 
   /**
    * @desc Certificate used by the Test System acting as ITS-S
@@ -58,12 +68,17 @@ module LibItsPki_Pics {
   /**
    * @desc Certificate used by the Test System acting as EA
    */
-  modulepar charstring PICS_TS_EA_CERTIFICATE_ID := "CERT_EA";
+  modulepar charstring PICS_TS_EA_CERTIFICATE_ID := "CERT_TS_A_EA";
   
   /**
    * @desc Certificate used by the Test System acting as AA
    */
-  modulepar charstring PICS_TS_AA_CERTIFICATE_ID := "CERT_AA";
+  modulepar charstring PICS_TS_AA_CERTIFICATE_ID := "CERT_TS_A_AA";
+  
+  /**
+   * @desc Certificate used by the Test System acting as EA
+   */
+  modulepar charstring PICS_TS_CA_CERTIFICATE_ID := "CERT_TS_RCA_A";
   
   /**
    * @desc Set to true if different end points are used for EC and AT
@@ -95,6 +110,17 @@ module LibItsPki_Pics {
    */
   modulepar boolean PICS_ITS_S_WITH_PRIVACY := true;
   
+  /**
+   * @desc Set to true if the PKI configuration authorize to configure an external EA entity
+   */
+
+  modulepar boolean PICS_SIMULATE_EA_ENTITY := false;
+  
+  /**
+   * @desc Set to true if the PKI configuration authorize to configure an external AA entity
+   */
+  modulepar boolean PICS_SIMULATE_AA_ENTITY := false;
+  
   /**
    * @desc HTTP POST URI for InnerECRequest
    */
@@ -169,5 +195,10 @@ module LibItsPki_Pics {
    * @desc Canonical ITSS-S identifier
    */
   modulepar octetstring PICS_ITS_S_CANONICAL_ID := '1B4CA1210123AE900BBE6C3EBAE7E87DA20DBDAB1E7B2EC0691C51C1021900AA'O;
+
+  /**
+   * @desc Invalid Canonical ITSS-S identifier
+   */
+  modulepar octetstring PICS_INVALID_ITS_S_CANONICAL_ID := '0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A'O;
   
 } // End of module LibItsPki_Pics

ttcn/Pki/LibItsPki_Pixits.ttcn

@@ -15,11 +15,6 @@ module LibItsPki_Pixits {
    */
   modulepar boolean PX_INCLUDE_ENCRYPTION_KEYS := true;
   
-  /**
-   * @desc Do the Authorization Request use SignedWithPop mechanism?
-   */
-  modulepar boolean PICS_PKI_AUTH_POP := true;
-
   /**
    * @desc Contains the private key for the EC certificate, used in case of re-enrolment
    */
@@ -53,4 +48,16 @@ module LibItsPki_Pixits {
    */
   modulepar SecurityAlg PX_VE_ALG := e_nist_p256;
   
+  modulepar octetstring PX_INNER_EC_CERTFICATE_BITMAP_SSP_SCR := '01C0'O;
+
+  modulepar octetstring PX_INNER_EC_CERTFICATE_INCORRECT_BITMAP_SSP_SCR := '01FF'O;
+
+  modulepar octetstring PX_INNER_EC_CERTFICATE_BITMAP_SSP_CAM := '830001'O;
+  
+  modulepar octetstring PX_INNER_EC_CERTFICATE_BITMAP_SSP_DENM := '830001'O;
+  
+  modulepar octetstring PX_INNER_AT_CERTFICATE_BITMAP_SSP_CAM := '01FFFC'O;
+  
+  modulepar octetstring PX_INNER_AT_CERTFICATE_BITMAP_SSP_DENM := '01FFFFFF'O;
+  
 } // End of module LibItsPki_Pixits

ttcn/Pki/LibItsPki_Templates.ttcn

@@ -474,13 +474,13 @@ module LibItsPki_Templates {
   
   template CertificateSubjectAttributes mw_certificate_subject_attributes(
                                                                           template (present) SequenceOfPsidSsp p_appPermissions := ?,
-                                                                          template (present) CertificateId p_id := ?,
+                                                                          template CertificateId p_id := *,
                                                                           template (present) ValidityPeriod p_validityPeriod := ?,
                                                                           template (present) SubjectAssurance p_assuranceLevel := ?,
                                                                           template GeographicRegion p_region := *,
                                                                           template SequenceOfPsidGroupPermissions p_certIssuePermissions := omit
                                                                           ) := {
-    id                   := p_id,
+    id                   := p_id ifpresent,
     validityPeriod       := p_validityPeriod,
     region               := p_region,
     assuranceLevel       := p_assuranceLevel,

ttcn/Security/LibItsSecurity_Pixits.ttcn

@@ -65,5 +65,13 @@ module LibItsSecurity_Pixits {
      * @desc AES-128-CCM nonce public key
      */
     modulepar Oct12 PX_ENCRYPTIONPARAMETERS_AES_128_CCM_NONCE := 'C0FFEEDECAC0FFEEDECA0000'O;
+
+    modulepar CountryOnly PX_GENERATED_CERTIFICATE_REGION_COUNTRY_1 := 250;
     
-} // End of module LibItsSecurity_Pixits
\ No newline at end of file
+    modulepar CountryOnly PX_GENERATED_CERTIFICATE_REGION_COUNTRY_2 := 380;
+
+    modulepar Int16 PX_GENERATED_CERTIFICATE_DURATION := 120;
+
+    modulepar SubjectAssurance PX_GENERATED_CERTIFICATE_SUBJECT_ASSURENCE_LEVEL := '00'O;
+
+} // End of module LibItsSecurity_Pixits

ttcn/Security/LibItsSecurity_Templates.ttcn

@@ -1027,6 +1027,15 @@ module LibItsSecurity_Templates {
                                                                       template (present) Time64 p_generationTime := ?
                                                                       ) modifies mw_headerInfo_gn := {};
         
+        template HeaderInfo mw_headerInfo_inner_pki_response(
+                                                             template (present) Psid p_psid := c_its_aid_SCR,
+                                                             template Time64 p_generationTime := *
+                                                             ) modifies mw_ieee1609Dot2_headerInfo := {
+          generationTime       := p_generationTime,
+          expiryTime           := omit,
+          generationLocation   := omit
+        }
+        
     } // End of group headerFields
     
     group signatures {