Loading ttcn/Pki/LibItsPki_Functions.ttcn +5 −5 Original line number Original line Diff line number Diff line Loading @@ -67,7 +67,7 @@ module LibItsPki_Functions { ) runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { ) runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { map(self:pkiPort, system:pkiPort); map(self:pkiPort, system:pkiPort); map(self:acPkiPort, system:acPkiPort); map(self:acPort, system:acPort); f_connect4SelfOrClientSync(); f_connect4SelfOrClientSync(); f_initialiseSecuredMode(p_certificateId, p_peerCertificateId); f_initialiseSecuredMode(p_certificateId, p_peerCertificateId); Loading Loading @@ -121,7 +121,7 @@ module LibItsPki_Functions { */ */ function f_cfDown() runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { function f_cfDown() runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { unmap(self:pkiPort, system:pkiPort); unmap(self:pkiPort, system:pkiPort); unmap(self:acPkiPort, system:acPkiPort); unmap(self:acPort, system:acPort); f_disconnect4SelfOrClientSync(); f_disconnect4SelfOrClientSync(); f_uninitialiseSecuredMode(); f_uninitialiseSecuredMode(); } // End of function f_cfDown } // End of function f_cfDown Loading Loading @@ -192,13 +192,13 @@ module LibItsPki_Functions { var AcSetSecurityData v_ac_set_security_data; var AcSetSecurityData v_ac_set_security_data; v_ac_set_security_data := { PICS_TS_CERTIFICATE_ID, PICS_IUT_CERTIFICATE_ID, p_private_key, p_publicKeyCompressed, p_compressedMode }; v_ac_set_security_data := { PICS_TS_CERTIFICATE_ID, PICS_IUT_CERTIFICATE_ID, p_private_key, p_publicKeyCompressed, p_compressedMode }; acPkiPort.send(AcPkiPrimitive: { acSetSecurityData := v_ac_set_security_data }); acPort.send(AcPkiPrimitive: { acSetSecurityData := v_ac_set_security_data }); tc_ac.start; tc_ac.start; alt { alt { [] acPkiPort.receive(AcPkiResponse: { result := true }) { [] acPort.receive(AcPkiResponse: { result := true }) { tc_ac.stop; tc_ac.stop; } } [] acPkiPort.receive(AcPkiResponse: { result := false }) { [] acPort.receive(AcPkiResponse: { result := false }) { tc_ac.stop; tc_ac.stop; log("*** f_sendAcPkiPrimitive: ERROR: Received unexpected message ***"); log("*** f_sendAcPkiPrimitive: ERROR: Received unexpected message ***"); f_selfOrClientSyncAndVerdict("error", e_error); f_selfOrClientSyncAndVerdict("error", e_error); Loading ttcn/Pki/LibItsPki_TestSystem.ttcn +2 −12 Original line number Original line Diff line number Diff line Loading @@ -49,14 +49,6 @@ module LibItsPki_TestSystem { in AcPkiResponse; in AcPkiResponse; } // End of AdapterControlPort } // End of AdapterControlPort /** * @desc Adapter control port */ type port AdapterControlPkiPort message { out AcPkiPrimitive; in AcPkiResponse; } // End of AdapterControlPkiPort /** /** * @desc Upper Tester port * @desc Upper Tester port */ */ Loading @@ -78,7 +70,7 @@ module LibItsPki_TestSystem { group componentDefinitions { group componentDefinitions { type component ItsPkiSystem { type component ItsPkiSystem { port AdapterControlPkiPort acPkiPort; port AdapterControlPort acPort; port PkiPort pkiPort; port PkiPort pkiPort; } // End of component ItsPkiSystem } // End of component ItsPkiSystem Loading @@ -86,7 +78,6 @@ module LibItsPki_TestSystem { } // End of component ItsPkiHttpSystem } // End of component ItsPkiHttpSystem type component ItsPkiItssSystem extends ItsPkiSystem { type component ItsPkiItssSystem extends ItsPkiSystem { port AdapterControlPort acPort; port UpperTesterPort utPort; port UpperTesterPort utPort; port GeoNetworkingPort geoNetworkingPort; port GeoNetworkingPort geoNetworkingPort; } // End of component ItsPkiItssSystem } // End of component ItsPkiItssSystem Loading @@ -94,7 +85,7 @@ module LibItsPki_TestSystem { } // End of group componentDefinitions } // End of group componentDefinitions type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc { type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc { port AdapterControlPkiPort acPkiPort; port AdapterControlPort acPort; port PkiPort pkiPort; port PkiPort pkiPort; var Certificate vc_eaCertificate; /** Test Adapter EA certificate */ var Certificate vc_eaCertificate; /** Test Adapter EA certificate */ Loading @@ -110,7 +101,6 @@ module LibItsPki_TestSystem { } // End of component ItsPki } // End of component ItsPki type component ItsPkiItss extends ItsPki { type component ItsPkiItss extends ItsPki { port AdapterControlPort acPort; port UpperTesterPort utPort; port UpperTesterPort utPort; port GeoNetworkingPort geoNetworkingPort; port GeoNetworkingPort geoNetworkingPort; } // End of component ItsPkiItss } // End of component ItsPkiItss Loading Loading
ttcn/Pki/LibItsPki_Functions.ttcn +5 −5 Original line number Original line Diff line number Diff line Loading @@ -67,7 +67,7 @@ module LibItsPki_Functions { ) runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { ) runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { map(self:pkiPort, system:pkiPort); map(self:pkiPort, system:pkiPort); map(self:acPkiPort, system:acPkiPort); map(self:acPort, system:acPort); f_connect4SelfOrClientSync(); f_connect4SelfOrClientSync(); f_initialiseSecuredMode(p_certificateId, p_peerCertificateId); f_initialiseSecuredMode(p_certificateId, p_peerCertificateId); Loading Loading @@ -121,7 +121,7 @@ module LibItsPki_Functions { */ */ function f_cfDown() runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { function f_cfDown() runs on ItsPki /* TITAN TODO: system ItsPkiSystem */ { unmap(self:pkiPort, system:pkiPort); unmap(self:pkiPort, system:pkiPort); unmap(self:acPkiPort, system:acPkiPort); unmap(self:acPort, system:acPort); f_disconnect4SelfOrClientSync(); f_disconnect4SelfOrClientSync(); f_uninitialiseSecuredMode(); f_uninitialiseSecuredMode(); } // End of function f_cfDown } // End of function f_cfDown Loading Loading @@ -192,13 +192,13 @@ module LibItsPki_Functions { var AcSetSecurityData v_ac_set_security_data; var AcSetSecurityData v_ac_set_security_data; v_ac_set_security_data := { PICS_TS_CERTIFICATE_ID, PICS_IUT_CERTIFICATE_ID, p_private_key, p_publicKeyCompressed, p_compressedMode }; v_ac_set_security_data := { PICS_TS_CERTIFICATE_ID, PICS_IUT_CERTIFICATE_ID, p_private_key, p_publicKeyCompressed, p_compressedMode }; acPkiPort.send(AcPkiPrimitive: { acSetSecurityData := v_ac_set_security_data }); acPort.send(AcPkiPrimitive: { acSetSecurityData := v_ac_set_security_data }); tc_ac.start; tc_ac.start; alt { alt { [] acPkiPort.receive(AcPkiResponse: { result := true }) { [] acPort.receive(AcPkiResponse: { result := true }) { tc_ac.stop; tc_ac.stop; } } [] acPkiPort.receive(AcPkiResponse: { result := false }) { [] acPort.receive(AcPkiResponse: { result := false }) { tc_ac.stop; tc_ac.stop; log("*** f_sendAcPkiPrimitive: ERROR: Received unexpected message ***"); log("*** f_sendAcPkiPrimitive: ERROR: Received unexpected message ***"); f_selfOrClientSyncAndVerdict("error", e_error); f_selfOrClientSyncAndVerdict("error", e_error); Loading
ttcn/Pki/LibItsPki_TestSystem.ttcn +2 −12 Original line number Original line Diff line number Diff line Loading @@ -49,14 +49,6 @@ module LibItsPki_TestSystem { in AcPkiResponse; in AcPkiResponse; } // End of AdapterControlPort } // End of AdapterControlPort /** * @desc Adapter control port */ type port AdapterControlPkiPort message { out AcPkiPrimitive; in AcPkiResponse; } // End of AdapterControlPkiPort /** /** * @desc Upper Tester port * @desc Upper Tester port */ */ Loading @@ -78,7 +70,7 @@ module LibItsPki_TestSystem { group componentDefinitions { group componentDefinitions { type component ItsPkiSystem { type component ItsPkiSystem { port AdapterControlPkiPort acPkiPort; port AdapterControlPort acPort; port PkiPort pkiPort; port PkiPort pkiPort; } // End of component ItsPkiSystem } // End of component ItsPkiSystem Loading @@ -86,7 +78,6 @@ module LibItsPki_TestSystem { } // End of component ItsPkiHttpSystem } // End of component ItsPkiHttpSystem type component ItsPkiItssSystem extends ItsPkiSystem { type component ItsPkiItssSystem extends ItsPkiSystem { port AdapterControlPort acPort; port UpperTesterPort utPort; port UpperTesterPort utPort; port GeoNetworkingPort geoNetworkingPort; port GeoNetworkingPort geoNetworkingPort; } // End of component ItsPkiItssSystem } // End of component ItsPkiItssSystem Loading @@ -94,7 +85,7 @@ module LibItsPki_TestSystem { } // End of group componentDefinitions } // End of group componentDefinitions type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc { type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc { port AdapterControlPkiPort acPkiPort; port AdapterControlPort acPort; port PkiPort pkiPort; port PkiPort pkiPort; var Certificate vc_eaCertificate; /** Test Adapter EA certificate */ var Certificate vc_eaCertificate; /** Test Adapter EA certificate */ Loading @@ -110,7 +101,6 @@ module LibItsPki_TestSystem { } // End of component ItsPki } // End of component ItsPki type component ItsPkiItss extends ItsPki { type component ItsPkiItss extends ItsPki { port AdapterControlPort acPort; port UpperTesterPort utPort; port UpperTesterPort utPort; port GeoNetworkingPort geoNetworkingPort; port GeoNetworkingPort geoNetworkingPort; } // End of component ItsPkiItss } // End of component ItsPkiItss Loading