STF545: Review TPlan

ttcn/Pki/LibItsPki_Functions.ttcn

@@ -481,9 +481,11 @@ module LibItsPki_Functions {
       var boolean v_ret;
       
       // 1. Decrypt the data
-      if ((p_check_security == true) and (f_decrypt(v_private_enc_key, p_ieee1609dot2_encrypted_and_signed_data, v_ieee1609dot2_signed_data) == false)) {
+      if (f_decrypt(v_private_enc_key, p_ieee1609dot2_encrypted_and_signed_data, v_ieee1609dot2_signed_data) == false) {
+        if (p_check_security == true) {
           return false;
         }
+      }
       log("v_ieee1609dot2_signed_data= ", v_ieee1609dot2_signed_data);
       
       // 2. Check the signature
@@ -503,9 +505,11 @@ module LibItsPki_Functions {
                                                      p_peer_certificate.toBeSigned.verifyKeyIndicator.verificationKey.ecdsaNistP256.compressed_y_1,
                                                      1);
       }
-      if ((v_ret == false) and (p_check_security == true)) {
+      if (v_ret == false) {
+        if (p_check_security == true) {
           return false;
         }
+      }
 
       // 3. Retrun the PKI message
       v_etsi_ts_102941_data_msg := oct2bit(v_ieee1609dot2_signed_data.content.signedData.tbsData.payload.data.content.unsecuredData);
@@ -513,9 +517,11 @@ module LibItsPki_Functions {
         return false;
       }
 
-      if ((p_check_security == true) and (p_etsi_ts_102941_data.version != PkiProtocolVersion)) {
+      if (p_etsi_ts_102941_data.version != PkiProtocolVersion) {
+        if (p_check_security == true) {
           return false;
         }
+      }
       
       return true;
     } // End of function f_verify_pki_message

ttcn/Pki/LibItsPki_Pixits.ttcn

+module LibItsPki_Pixits {
+  
+  
+} // End of module LibItsPki_Pixits