Commit a4bcc0ab authored by YannGarcia's avatar YannGarcia
Browse files

Building AtsPki with latest version of IEEE1609.2.1 ASN files

parent 7989a53a
Loading
Loading
Loading
Loading
+79 −79

File changed.

Preview size limit exceeded, changes collapsed.

Compare 650d0d6d to f2b35013
Original line number Diff line number Diff line
Subproject commit 650d0d6d17aaf0e917e64a4f8131d25147510821
Subproject commit f2b350132723c80544f9e936eedebeba9ceb804b
+22 −5
Original line number Diff line number Diff line
@@ -12,7 +12,24 @@ sources += asn1/EtsiTs102941BaseTypes.asn \
           asn1/EtsiTs102941TypesAuthorizationValidation.asn \
           asn1/EtsiTs102941TypesCaManagement.asn \
           asn1/EtsiTs102941TypesEnrolment.asn    \
           asn1/EtsiTs102941TypesLinkCertificate.asn
           asn1/EtsiTs102941TypesLinkCertificate.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EeRaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaRaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaEeInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaLaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaMaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1CertManagement.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EcaEeInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EeMaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaRaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaMaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1MaRaInterface.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Acpc.asn \
           asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Protocol.asn \
           asn1/ieee_1609.2.1/ieee1609dot2/Ieee1609Dot2.asn          \
           asn1/ieee_1609.2.1/ieee1609dot2/Ieee1609Dot2BaseTypes.asn \
           asn1/ieee_1609.2.1/ieee1609dot2/Ieee1609Dot2CrlBaseTypes.asn \
           asn1/ieee_1609.2.1/ieee1609dot2/Ieee1609Dot2Crl.asn
endif           

ifeq (,$(findstring EtsiTs103097Module.asn,$(all_sources)))
@@ -20,7 +37,7 @@ sources += asn1/sec/EtsiTs103097ExtensionModule.asn \
           asn1/sec/EtsiTs103097Module.asn
endif

ifeq (,$(findstring Ieee1609Dot2.asn,$(all_sources)))
sources += asn1/sec/ieee1609dot2/Ieee1609Dot2.asn             \
           asn1/sec/ieee1609dot2/Ieee1609Dot2BaseTypes.asn 
endif
#ifeq (,$(findstring Ieee1609Dot2.asn,$(all_sources)))
#sources += asn1/sec/ieee1609dot2/Ieee1609Dot2.asn             \
#           asn1/sec/ieee1609dot2/Ieee1609Dot2BaseTypes.asn 
#endif
+10 −10
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ module LibItsPki_Functions {
  import from EtsiTs102941MessagesCa language "ASN.1:1997" all;
  import from EtsiTs102941TrustLists language "ASN.1:1997" all;
  import from EtsiTs103097Module language "ASN.1:1997" all;
  import from ITS_Container language "ASN.1:1997" all;
  import from ETSI_ITS_CDD language "ASN.1:1997" all;
  import from CAM_PDU_Descriptions language "ASN.1:1997" all;
  
  // LibItsCommon
@@ -2726,7 +2726,7 @@ module LibItsPki_Functions {
                                                                                                                                                                
                                                                                                                                                                v_encrypted_data_encryption_key                                                                                                                                                            ))
                                                                                                                },
                                                                                                              m_SymmetricCiphertext_aes128ccm(
                                                                                                              m_symmetricCiphertext_aes128ccm(
                                                                                                                                              m_aesCcmCiphertext(
                                                                                                                                                                 v_nonce,
                                                                                                                                                                 v_enc_signed_ec_signature
@@ -3112,7 +3112,7 @@ module LibItsPki_Functions {
                                                                                                                                                                
                                                                                                                                                                v_encrypted_data_encryption_key                                                                                                                                                            ))
                                                                                                                },
                                                                                                              m_SymmetricCiphertext_aes128ccm(
                                                                                                              m_symmetricCiphertext_aes128ccm(
                                                                                                                                              m_aesCcmCiphertext(
                                                                                                                                                                 v_nonce,
                                                                                                                                                                 v_enc_signed_ec_signature
@@ -4363,7 +4363,7 @@ module LibItsPki_Functions {
                                                                                                                                              mw_enrolmentResponseMessage(
                                                                                                                                                                          mw_encryptedData(
                                                                                                                                                                                           { *, mw_recipientInfo_pskRecipInfo(v_aes_sym_key_hashed_id8), * },
                                                                                                                                                                                           mw_SymmetricCiphertext_aes128ccm
                                                                                                                                                                                           mw_symmetricCiphertext_aes128ccm
                                                                                                                                                                                           )))))),
                                            v_response
                                            ) {
@@ -4429,7 +4429,7 @@ module LibItsPki_Functions {
                                                                                                                                              mw_enrolmentRequestMessage(
                                                                                                                                                                         mw_encryptedData(
                                                                                                                                                                                          -,
                                                                                                                                                                                          mw_SymmetricCiphertext_aes128ccm
                                                                                                                                                                                          mw_symmetricCiphertext_aes128ccm
                                                                                                                                                                                          )))))),
                                            p_request
                                            ) {
@@ -4494,7 +4494,7 @@ module LibItsPki_Functions {
                                                                                                                                              mw_enrolmentRequestMessage(
                                                                                                                                                                         mw_encryptedData(
                                                                                                                                                                                          -,
                                                                                                                                                                                          mw_SymmetricCiphertext_aes128ccm
                                                                                                                                                                                          mw_symmetricCiphertext_aes128ccm
                                                                                                                                                                                          )))))),
                                            p_request
                                            ) {
@@ -4706,7 +4706,7 @@ module LibItsPki_Functions {
                                                                                                                                                         v_encrypted_data_encryption_key
                                                                                                                                                         ))
                                                                                                         },
                                                                                                       m_SymmetricCiphertext_aes128ccm(
                                                                                                       m_symmetricCiphertext_aes128ccm(
                                                                                                                                       m_aesCcmCiphertext(
                                                                                                                                                          p_nonce,
                                                                                                                                                          v_encrypted_request
@@ -4814,7 +4814,7 @@ module LibItsPki_Functions {
                                                                                                                                                        v_encrypted_data_encryption_key
                                                                                                                                                        ))
                                                                                                        },
                                                                                                       m_SymmetricCiphertext_aes128ccm(
                                                                                                       m_symmetricCiphertext_aes128ccm(
                                                                                                                                       m_aesCcmCiphertext(
                                                                                                                                                          p_nonce,
                                                                                                                                                          v_encrypted_request
@@ -4918,7 +4918,7 @@ module LibItsPki_Functions {
                                                                                                                                                        v_encrypted_data_encryption_key
                                                                                                                                                        ))
                                                                                                        },
                                                                                                       m_SymmetricCiphertext_aes128ccm(
                                                                                                       m_symmetricCiphertext_aes128ccm(
                                                                                                                                       m_aesCcmCiphertext(
                                                                                                                                                          p_nonce,
                                                                                                                                                          v_encrypted_request
@@ -5011,7 +5011,7 @@ module LibItsPki_Functions {
                                                                                                                                     v_recipientId
                                                                                                                                     )
                                                                                                       },
                                                                                                       m_SymmetricCiphertext_aes128ccm(
                                                                                                       m_symmetricCiphertext_aes128ccm(
                                                                                                                                       m_aesCcmCiphertext(
                                                                                                                                                          p_nonce,
                                                                                                                                                          v_encrypted_inner_ec_response