Commit 99daa1d6 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add certificates references for AtsMBR

parent 2666a89c
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -175,6 +175,11 @@ module LibItsSecurity_TypesAndValues {
        const charstring cc_iutCert_D        := "CERT_IUT_D_AT"; /** Certificate with a polygonal region, to be used when secured messages are sent from TA to IUT */
        const charstring cc_iutCert_E        := "CERT_IUT_E_AT"; /** Certificate with a region identifier, to be used when secured messages are sent from TA to IUT */
        const charstring cc_iutCert_F        := "CERT_IUT_F_AT"; /** Certificate with a subject type indicating 'enrolment_credentials', to be used when secured messages are sent from TA to IUT */
        const charstring cc_iutCert_A_NOCAM := "CERT_IUT_A_AT_NOCAM"; /** Certificate CERT_IUT_A_AT with CAM PSID not containing in the appPermissions of the certificate */
        const charstring cc_iutCert_A_PAST  := "CERT_IUT_A_AT_PAST"; /** Certificate CERT_IUT_A_AT with validity period in the past */
        const charstring cc_iutCert_A_NO_EMERGENCY_CONTAINER  := "CERT_IUT_A_AT_NO_EMERGENCY_CONTAINER";
                                                                     /** Certificate CERT_IUT_A_AT with SSP for emergency comntainer unset */
        const charstring cc_iutCert_A_LOC_OUTSIDE := "CERT_IUT_A_AT_LOC_OUTSIDE"; /** Certificate CERT_IUT_A_AT with the identified validity outside */

    /** 
     * @desc Specification of basic format elements
+15 −10
Original line number Diff line number Diff line
@@ -1588,16 +1588,17 @@ module LibItsSecurity_Functions {
                                            in ToBeSignedData p_payloadField,
                                            in SignerIdentifier p_signerIdentifierType, // FIXME To be reviewed
                                            in charstring p_certificateName,
                                            in UInt8 p_protocolVersion,
                                            in boolean p_alter_psid,
                                            in boolean p_add_generation_location,
                                            in boolean p_add_expiry_time,
                                            in boolean p_add_p2pcd_learning_request,
                                            in boolean p_add_missing_crl_identifier,
                                            in boolean p_add_encryption_key,
                                            in boolean p_alter_signature_algorithm,
                                            in boolean p_alter_signer_identifier,
                                            in boolean p_alter_signature
                                            in UInt8 p_protocolVersion := 3,
                                            in boolean p_alter_psid := false,
                                            in boolean p_add_generation_location:= false,
                                            in boolean p_add_expiry_time:= false,
                                            in boolean p_add_p2pcd_learning_request:= false,
                                            in boolean p_add_missing_crl_identifier:= false,
                                            in boolean p_add_encryption_key:= false,
                                            in boolean p_alter_signature_algorithm:= false,
                                            in boolean p_alter_signer_identifier:= false,
                                            in boolean p_alter_signature:= false,
                                            in boolean p_remove_generationTime:= false
                                            ) runs on ItsSecurityBaseComponent return boolean {
                
                // Local variables
@@ -1664,6 +1665,10 @@ module LibItsSecurity_Functions {
                if (p_alter_psid == true) {
                  p_securedMessage.content.signedData.tbsData.headerInfo.psid := 99;
                }
                // Remove GenerationTime
                if (p_remove_generationTime == true) {
                  p_securedMessage.content.signedData.tbsData.headerInfo.generationTime := omit;
                }
                // Add generationLocation
                if (p_add_generation_location == true) {
                  p_securedMessage.content.signedData.tbsData.headerInfo.generationLocation := valueof(m_threeDLocation(PX_WGSLATITUDE, PX_WGSLONGITUDE, 0));