ITS-CMS6 Plugtest validation

ccsrc/EncDec/LibItsPki_Encdec.cc

@@ -8,6 +8,7 @@
 #include "etsi_ts102941_types_authorization_inner_response.hh"
 #include "etsi_ts102941_types_authorization_shared_at_request.hh"
 #include "etsi_ts102941_types_authorization_validation_request.hh"
+#include "etsi_ts102941_types_authorization_validation_response.hh"
 #include "etsi_ts102941_base_types_public_keys.hh"
 #include "ieee_1609dot2_base_types_public_encryption_key.hh"
 #include "ieee_1609dot2_base_types_public_verification_key.hh"
@@ -230,7 +231,34 @@ namespace LibItsPki__EncdecDeclarations {
     return 0;
   }
   
-BITSTRING fx__enc__PublicKeys(EtsiTs102941BaseTypes::PublicKeys const& p_public_keys) {
+    BITSTRING fx__enc__AuthorizationValidationResponse(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse const& p_shared_at) {
+    loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationResponse: ", p_shared_at);
+
+    etsi_ts102941_types_authorization_validation_response codec;
+    OCTETSTRING os;
+    if (codec.encode(p_shared_at, os) == -1) {
+      loggers::get_instance().warning("fx__enc__AuthorizationValidationResponse: -1 result code was returned");
+      return int2bit(0, 1);
+    }
+
+    return oct2bit(os);
+  }
+  
+  INTEGER fx__dec__AuthorizationValidationResponse(BITSTRING& b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse& p_shared_at) {
+    loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationResponse: ", b);
+
+    etsi_ts102941_types_authorization_validation_response codec;
+    OCTETSTRING is = bit2oct(b);
+    if (codec.decode(is, p_shared_at) == -1) {
+      loggers::get_instance().warning("fx__dec__AuthorizationValidationResponse: -1 result code was returned");
+      return -1;
+    }
+
+    loggers::get_instance().log_msg("<<< fx__dec__AuthorizationValidationResponse: ", p_shared_at);
+    return 0;
+  }
+  
+  BITSTRING fx__enc__PublicKeys(EtsiTs102941BaseTypes::PublicKeys const& p_public_keys) {
     loggers::get_instance().log_msg(">>> fx__enc__PublicKeys: ", p_public_keys);
 
     etsi_ts102941_base_types_public_keys codec;

ccsrc/Protocols/Security/etsi_ts102941_types_authorization_validation_response.hh

@@ -11,7 +11,7 @@ public:
   explicit etsi_ts102941_types_authorization_validation_response() : codec<EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse>() { };
   virtual ~etsi_ts102941_types_authorization_validation_response() { };
 
-  virtual int encode (const EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse& p_validation_response, OCTETSTRING& p_data);
-  virtual int decode (const OCTETSTRING& p_data, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse& p_validation_response, params* p_params = NULL);
+  virtual int encode (const EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse& p_authorization_validation_response, OCTETSTRING& p_data);
+  virtual int decode (const OCTETSTRING& p_data, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse& p_authorization_validation_response, params* p_params = NULL);
 }; // End of class etsi_ts102941_types_authorization_validation_response
 

etc/AtsPki/AtsPki_Atos.cfg_

@@ -44,7 +44,7 @@ system.utPort.params := "UT_PKI/UDP(dst_ip=172.23.0.1,dst_port=8000)"
 
 [EXECUTE]
 # The EnrolmentResponse message shall be sent by the EA to the ITS-S across the interface at reference point S3 in response to a received EnrolmentRequest message
-ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV
+#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV
 # Check that EA doesn't accept Enrolment rekeying request when enrolment is not permitted by signing certificate
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI
 
@@ -61,8 +61,12 @@ ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_09_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_10_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_11_BV
-#ItsPki_TestCases.TC_SEC_PKI_SND_EA_AA_BV_01
-#ItsPki_TestCases.TC_SEC_PKI_SND_AA_BV_01
+
+#
+#ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_RCV_01_BV
+
+# 
+ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_01_BV
 
 [MAIN_CONTROLLER]
 # The options herein control the behavior of MC.

etc/AtsPki/AtsPki_Escrypt.cfg_

+
 [MODULE_PARAMETERS]
 # This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
 
@@ -13,7 +14,7 @@ LibItsHttp_Pics.PICS_HEADER_HOST          := "test.bsi.v2x-pilot.escrypt.com"
 
 LibItsPki_Pics.PICS_HTTP_POST_URI_EC      := "/ea/enrolment"
 LibItsPki_Pics.PICS_HTTP_POST_URI_AT      := "/aa/authorization"
-LibItsPki_Pics.PICS_HTTP_POST_URI_ATV     := "/aa/authorize"
+LibItsPki_Pics.PICS_HTTP_POST_URI_ATV     := "/ea/validation"
 
 LibItsPki_Pics.PICS_ITS_S_WITH_PRIVACY                    := false
 LibItsPki_Pics.PICS_ITS_S_SIGN_NITSP256_PRIVATE_KEY       := '749509D6C5243059A9F73C26DAD46EAE30E3606D83413D94CF134FBA9071617F'O
@@ -70,10 +71,20 @@ system.httpPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TC
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_09_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_10_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_11_BV
-#ItsPki_TestCases.TC_SEC_PKI_SND_EA_AA_BV_01
-#ItsPki_TestCases.TC_SEC_PKI_SND_AA_BV_01
+#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI
+
+# 
+#ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_RCV_01_BV
+
+#
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_01_BV
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_03_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_04_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_05_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_06_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_07_BI
 
-ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_01_BV
+ItsPki_TestCases.TC_SECPKI_AA_AUTHVAL_01_BV
 
 [MAIN_CONTROLLER]
 # The options herein control the behavior of MC.

etc/AtsPki/AtsPki_Gemalto.cfg_

@@ -54,14 +54,12 @@ system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)
 system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=52.85.182.235)" #etsi.authorization.aa.msi-dev.acloud.gemalto.com
 
 [EXECUTE]
-# The EnrolmentResponse message shall be sent by the EA to the ITS-S across the interface at reference point S3 in response
-# to a received EnrolmentRequest message
+# The EnrolmentResponse message shall be sent by the EA to the ITS-S across the interface at reference point S3 in response to a received EnrolmentRequest message
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV
 # Check that EA doesn't accept Enrolment rekeying request when enrolment is not permitted by signing certificate
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI
 
-# The EnrolmentResponse message shall be encrypted using an ETSI TS 103 097 approved algorithm and the encryption shall be
-#done with the same AES key as the one used by the ITS-S requestor for the encryption of the EnrolmentRequest message.
+# The EnrolmentResponse message shall be encrypted using an ETSI TS 103 097 approved algorithm and the encryption shall be done with the same AES key as the one used by the ITS-S requestor for the encryption of the EnrolmentRequest message.
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_01_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_02_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_03_BV
@@ -74,12 +72,20 @@ system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_09_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_10_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_11_BV
+#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI
 
-# The AuthorizationValidationResponse message shall be sent by the EA to the AA across the interface at reference point S4
-#in response to a received AuthorizationValidationRequest message
-ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_RCV_01_BV
+# 
+#ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_RCV_01_BV
 
+#
 #ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_01_BV
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_03_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_04_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_05_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_06_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_07_BI
+
+ItsPki_TestCases.TC_SECPKI_AA_AUTHVAL_01_BV
 
 [MAIN_CONTROLLER]
 # The options herein control the behavior of MC.

etc/AtsPki/AtsPki_Idnomic.cfg_

@@ -71,12 +71,20 @@ system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_09_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_10_BV
 #ItsPki_TestCases.TC_SECPKI_EA_ENR_11_BV
+#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI
 
-#
+# 
 #ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_RCV_01_BV
 
-# 
-ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_01_BV
+#
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_01_BV
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_03_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_04_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_05_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_06_BI
+#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_07_BI
+
+ItsPki_TestCases.TC_SECPKI_AA_AUTHVAL_01_BV
 
 [MAIN_CONTROLLER]
 # The options herein control the behavior of MC.

ttcn/AtsSecurity/ItsSecurity_Pics.ttcn

@@ -30,19 +30,18 @@ module ItsSecurity_Pics {
     type record of certificates_foi certificates_fois;
     
     modulepar certificates_fois PICS_CERTFICATES_FOI := {
-        { cc_iutCert_A, sha256, '90E44C1245792A49'O, '34327D779729EDF1'O, omit }, // CERT_IUT_A_AT
-        { cc_iutCert_B, sha256, '90E44C1245792A49'O, 'FC44B103D934B8F9'O, { circularRegion := { center := {436169490, 70533080}, radius := 5000 } } }, // CERT_IUT_B_AT
-        { cc_iutCert_C, sha256, '90E44C1245792A49'O, 'F3D658C0C1253B76'O, { rectangularRegion := { { northWest := { latitude := 436618657, longitude := 70083912 }, southEast := { latitude := 435720322, longitude := 70982247 } } } } }, // CERT_IUT_C_AT
+        { cc_iutCert_A, sha256, '39CF4DF85C18EBA5'O, 'EFEB473043DD2B88'O, omit }, // CERT_IUT_A_AT
+        { cc_iutCert_B, sha256, '39CF4DF85C18EBA5'O, 'E9DAF8626F52D687'O, { circularRegion := { center := {436169490, 70533080}, radius := 5000 } } }, // CERT_IUT_B_AT
+        { cc_iutCert_C, sha256, '39CF4DF85C18EBA5'O, '46C778C826B25328'O, { rectangularRegion := { { northWest := { latitude := 436618657, longitude := 70083912 }, southEast := { latitude := 435720322, longitude := 70982247 } } } } }, // CERT_IUT_C_AT
 
-        { cc_taCert_A1, sha256, '90E44C1245792A49'O, '0F05DF571684EF09'O, omit }, // CERT_IUT_A1_AT
-        { cc_taCert_A2, sha256, '90E44C1245792A49'O, '23B6A4D3A0943554'O, omit }, // CERT_IUT_A2_AT
-        { cc_taCert_A3, sha256, '90E44C1245792A49'O, '50B90BA7C0C78B36'O, omit }, // CERT_IUT_A3_AT
+        { cc_taCert_A1, sha256, '39CF4DF85C18EBA5'O, '01063FEF92C015BB'O, omit }, // CERT_IUT_A1_AT
+        { cc_taCert_A2, sha256, '39CF4DF85C18EBA5'O, '9D22335CEA81F889'O, omit }, // CERT_IUT_A2_AT
+        { cc_taCert_A3, sha256, '39CF4DF85C18EBA5'O, '50B90BA7C0C78B36'O, omit }, // CERT_IUT_A3_AT
 
-
-        { cc_taCert_C1, sha256, 'BDD1B3C896212028'O, '5C8ADAB1B4412508'O, omit }, // CERT_IUT_C1_AT
-        { cc_taCert_CA1, sha256, 'BDD1B3C896212028'O, '0C58E89DF708EA4D'O, omit }, // CERT_IUT_CA1_AT
-        { cc_taCert_CA2, sha256, '8E5F576A60446F0A'O, 'B1B405EEA70AA315'O, omit }, // CERT_IUT_CA2_AT
-        { cc_taCert_CA3, sha256, 'BB5A67383EF27750'O, '8FE46E460E54AC0A'O, omit } // CERT_IUT_CA3_AT
+        { cc_taCert_C1, sha256, 'EC0EFC5EE781AE35'O, '0E54BA7D4E5C3A94'O, omit }, // CERT_IUT_C1_AT
+        { cc_taCert_CA1, sha256, 'EC0EFC5EE781AE35'O, '845086F7305687C3'O, omit }, // CERT_IUT_CA1_AT
+        { cc_taCert_CA2, sha256, '19289FF3AD70C0D1'O, '7F78196AC6807225'O, omit }, // CERT_IUT_CA2_AT
+        { cc_taCert_CA3, sha256, 'F6A320443DEF49C9'O, '1D861E271611A7EA'O, omit } // CERT_IUT_CA3_AT
         
     }
     

LibIts @ aa689ac9

-Subproject commit e0f2ad9fa39772f3c690b83c8b6fd4a95a125381
+Subproject commit aa689ac9f86aa49a1306dda851681e8d93c8e631