Start reviewing ITS-S EC tests

ttcn/Http/LibItsHttp_Templates.ttcn

@@ -140,6 +140,19 @@ module LibItsHttp_Templates {
           body          := p_body
       } // End of template m_http_response_ko
       
+      template (value) Response m_http_response_ko_no_body(
+                                                           in template (value) HeaderLines p_header,
+                                                           in template (value) integer p_statuscode := 404,
+                                                           in template (value) charstring p_statustext := "Not found"
+      ) := {
+          version_major := 1,
+          version_minor := 1,
+          statuscode    := p_statuscode,
+          statustext    := p_statustext,
+          header        := p_header,
+          body          := omit
+      } // End of template m_http_response_ko_no_body
+      
       template Response mw_http_response_ko(
                                             template HttpMessageBody p_body  := *,
                                             template (present) HeaderLines p_header := ?

ttcn/Pki/LibItsPki_Pixits.ttcn

@@ -29,6 +29,11 @@ module LibItsPki_Pixits {
    * @desc Contains the hashed id8 of the EC certificate, used in case of re-enrolment
    */
   modulepar HashedId8 PX_EC_HASHED_ID8 := int2oct(0, 8);
+
+  /**
+   * @desc Contains the hash of the EC certificate, used in case of re-enrolment
+   */
+  modulepar Oct32 PX_EC_HASH := int2oct(0, 32);
   
   /**
    * @desc Indicate which encryption algorithem to be used

ttcn/Pki/LibItsPki_Templates.ttcn

@@ -415,4 +415,20 @@ module LibItsPki_Templates {
     certIssuePermissions := p_certIssuePermissions
   } // End of template m_certificate_subject_attributes
   
+  template CertificateSubjectAttributes mw_certificate_subject_attributes(
+                                                                          template (present) SequenceOfPsidSsp p_appPermissions := ?,
+                                                                          template (present) 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,
+    validityPeriod       := p_validityPeriod,
+    region               := p_region,
+    assuranceLevel       := p_assuranceLevel,
+    appPermissions       := p_appPermissions,
+    certIssuePermissions := p_certIssuePermissions
+  } // End of template mw_certificate_subject_attributes
+  
 } // End of module LibItsPki_Templates

ttcn/Pki/LibItsPki_TypesAndValues.ttcn

@@ -28,6 +28,8 @@ module LibItsPki_TypesAndValues {
     e_brainpool_p256_r1 (1),
     e_brainpool_p384_r1 (2)
   } // End of type SecurityAlg
+
+  type set of PublicVerificationKey ListOfPublicVerificationKey;
   
   group utPrimitives {
 

ttcn/Security/LibItsSecurity_Functions.ttcn

 /**
- *  @author   ETSI / STF481 / STF507 / STF517 / STF538
+ *  @author   ETSI / STF481 / STF507 / STF517 / STF538 / STF545
  *  @version  $URL$
  *            $Id$
  *  @desc     Module containing functions for Security Protocol

ttcn/Security/LibItsSecurity_Templates.ttcn

 /**
- *  @author   ETSI / STF481 / STF507 / STF517 / STF538
+ *  @author   ETSI / STF481 / STF507 / STF517 / STF538 / STF545
  *  @version  $URL$
  *            $Id$
  *  @desc     Module containing templates for Security Protocol
@@ -1010,15 +1010,20 @@ module LibItsSecurity_Templates {
             requestedCertificate := *
         } // End of template mw_headerInfo_gn
         
-        template (omit) HeaderInfo m_headerInfo_inner_ec_request(
-                                                                 in template (value) Psid p_psid := c_its_aid_GN,
-                                                                 in template (value) Time64 p_generationTime
-        ) modifies m_headerInfo_gn := {};
-        
-        template (omit) HeaderInfo m_headerInfo_inner_ec_response(
-                                                                  in template (value) Psid p_psid := c_its_aid_GN,
+        template (omit) HeaderInfo m_headerInfo_inner_pki_request(
+                                                                  in template (value) Psid p_psid := c_its_aid_SCR,
                                                                   in template (value) Time64 p_generationTime
-        ) modifies m_headerInfo_gn := {};
+                                                                  ) modifies m_headerInfo_gn := {};
+        
+        template (omit) HeaderInfo m_headerInfo_inner_pki_response(
+                                                                   in template (value) Psid p_psid := c_its_aid_SCR,
+                                                                   in template (value) Time64 p_generationTime
+                                                                   ) modifies m_headerInfo_gn := {};
+        
+        template (present) HeaderInfo mw_headerInfo_inner_pki_request(
+                                                                      template (present) Psid p_psid := c_its_aid_SCR,
+                                                                      template (present) Time64 p_generationTime := ?
+                                                                      ) modifies mw_headerInfo_gn := {};
         
     } // End of group headerFields