STF545: Add acPort support for Pki (311f461d) · Commits · TTCN-3 Libraries / LibIts

ttcn/Pki/LibItsPki_TestSystem.ttcn

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -43,29 +43,28 @@ module LibItsPki_TestSystem {
	/**		/**
	* @desc Adapter control port		* @desc Adapter control port
	*/		*/
	type port AdapterControlPort message {		// type port AdapterControlPort message {
	out AcPkiPrimitive;		// out AcPkiPrimitive;
	in AcPkiResponse;		// in AcPkiResponse;
	} // End of AdapterControlPort		// } // End of AdapterControlPort

	type port PkiPort message {		type port PkiPort message {
	inout InnerEcRequest, InnerEcResponse;		inout InnerEcRequest, InnerEcResponse;
	}		}

	type component ItsPkiSystem {		type component ItsPkiSystem {
			// port LibItsPki_TestSystem.AdapterControlPort acPkiPort;
	port PkiPort pkiPort;		port PkiPort pkiPort;
	} // End of component ItsPkiSystem		} // End of component ItsPkiSystem

	type component ItsPkiHttpSystem extends HttpTestAdapter{		type component ItsPkiHttpSystem extends HttpTestAdapter{
	} // End of component ItsPkiHttpSystem		} // End of component ItsPkiHttpSystem

	type component ItsPkiItssSystem extends ItsPkiSystem {		type component ItsPkiItssSystem extends ItsPkiSystem, ItsGeoNetworking {
	port LibItsGeoNetworking_TestSystem.AdapterControlPort acPort;
	port LibItsGeoNetworking_TestSystem.UpperTesterPort utPort;
	port GeoNetworkingPort geoNetworkingPort;
	} // End of component ItsPkiItssSystem		} // End of component ItsPkiItssSystem

	type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc {		type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc {
			// port LibItsPki_TestSystem.AdapterControlPort acPkiPort;
	port PkiPort pkiPort;		port PkiPort pkiPort;

	var Certificate vc_eaCertificate; /** Test Adapter EA certificate */		var Certificate vc_eaCertificate; /** Test Adapter EA certificate */
	@@ -77,6 +76,7 @@ module LibItsPki_TestSystem {

	type component ItsPkiItss extends ItsGeoNetworking {		type component ItsPkiItss extends ItsGeoNetworking {
	port PkiPort pkiPort;		port PkiPort pkiPort;
			// port LibItsPki_TestSystem.AdapterControlPort acPkiPort;
	} // End of component ItsPkiItss		} // End of component ItsPkiItss

	} // End of module LibItsPki_TestSystem		} // End of module LibItsPki_TestSystem

ttcn/Pki/LibItsPki_TypesAndValues.ttcn

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ module LibItsPki_TypesAndValues {

	type record AcSetSecurityData {		type record AcSetSecurityData {
	charstring certificateId,		charstring certificateId,
			charstring peer_certificateId,
	octetstring private_key,		octetstring private_key,
	octetstring public_key_compressed,		octetstring public_key_compressed,
	integer public_key_compressed_mode		integer public_key_compressed_mode

Admin message