Commit 4cddd0bd authored by Yann Garcia's avatar Yann Garcia
Browse files

Matching empty payload in TC_GEONW_FDV_SHB_BV_01 et.al.

parent d35994ab

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ module LibItsGeoNetworking_Templates { 
                    p_hopLimit

                ),

                extendedHeader := mw_shbHeader(p_sourceLongPosVec),

                payload := ?

                payload := *

            }

            

        } // end group geoNwPacketShbTemplates
@@ -1323,7 +1323,7 @@ module LibItsGeoNetworking_Templates { 
                    m_tsbHeaderType

                ),

                extendedHeader := mw_tsbHeader(p_seqNumber, p_sourceLongPosVec),

                payload := ?

                payload := *

            }

            

            /**
@@ -1403,7 +1403,7 @@ module LibItsGeoNetworking_Templates { 
                    m_saHeaderType_sa

                ),

                extendedHeader := mw_saHeader(p_seqNumber, p_sourceLongPosVec),

                payload := ?

                payload := *

            }

            

            /**

ttcn/Pki/LibItsPki_Functions.ttcn

+3 −4
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ module LibItsPki_Functions { 
      

      // Setup AA certificate shared with PKI AA entity

      f_readCertificate(p_aa_certificate_id, vc_aaCertificate);

      f_readSigningKey(p_ea_certificate_id, vc_aaPrivateKey); // TODO To be removed

      f_readEncryptingKey(p_ea_certificate_id, vc_aaPrivateEncKey);

      f_readSigningKey(p_aa_certificate_id, vc_aaPrivateKey); // Required for AuthorizationValidation request

      f_readEncryptingKey(p_aa_certificate_id, vc_aaPrivateEncKey);

      f_getCertificateDigest(p_aa_certificate_id, vc_aaHashedId8);

      f_getCertificateHash(p_aa_certificate_id, vc_aaWholeHash);

      log("f_cfHttpUp: vc_aaPrivateKey= ", vc_aaPrivateKey);
@@ -915,7 +915,6 @@ module LibItsPki_Functions { 
    

    function f_http_build_authorization_validation_request(

                                                           in InnerAtRequest p_inner_at_request,

                                                           in octetstring p_private_key,

                                                           in octetstring p_public_key_compressed,

                                                           in integer p_compressed_key_mode,

                                                           in octetstring p_private_enc_key,
@@ -954,7 +953,7 @@ module LibItsPki_Functions { 
      log("f_http_build_authorization_validation_request: Public encryption key comp: ", v_compressed_enc_key_mode);

      p_salt := vc_eaWholeHash;

      log("f_http_build_authorization_validation_request: p_salt: ", p_salt);

      if(f_build_pki_secured_request_message_signed_with_pop(p_private_key, valueof(m_signerIdentifier_digest(vc_aaHashedId8)), vc_eaHashedId8/*recipientId*/, v_public_enc_key, v_compressed_enc_key_mode, p_salt, bit2oct(encvalue(m_etsiTs102941Data_authorization_validation_request(v_authorization_validation_request))), PX_EC_ALG_FOR_ATV, p_ieee1609dot2_signed_and_encrypted_data, p_aes_sym_key, p_encrypted_sym_key, p_authentication_vector, p_nonce, p_request_hash) == false) {

      if(f_build_pki_secured_request_message_signed_with_pop(vc_aaPrivateKey, valueof(m_signerIdentifier_digest(vc_aaHashedId8)), vc_eaHashedId8/*recipientId*/, v_public_enc_key, v_compressed_enc_key_mode, p_salt, bit2oct(encvalue(m_etsiTs102941Data_authorization_validation_request(v_authorization_validation_request))), PX_EC_ALG_FOR_ATV, p_ieee1609dot2_signed_and_encrypted_data, p_aes_sym_key, p_encrypted_sym_key, p_authentication_vector, p_nonce, p_request_hash) == false) {

        log("f_http_build_authorization_validation_request: Failed to generate Authorization Request");

        f_selfOrClientSyncAndVerdict("error", e_error);

      }