STF545: Add acPort support for Pki

ttcn/Pki/LibItsPki_TestSystem.ttcn

@@ -43,29 +43,28 @@ module LibItsPki_TestSystem {
   /**
    * @desc Adapter control port
    */
-  type port AdapterControlPort message {
-    out AcPkiPrimitive;
-    in AcPkiResponse;
-  } // End of AdapterControlPort
+  //  type port AdapterControlPort message {
+  //    out AcPkiPrimitive;
+  //    in AcPkiResponse;
+  //  } // End of AdapterControlPort
   
   type port PkiPort message {
     inout InnerEcRequest, InnerEcResponse;
   }
   
   type component ItsPkiSystem {
+    //    port LibItsPki_TestSystem.AdapterControlPort acPkiPort;
     port PkiPort pkiPort;
   } // End of component ItsPkiSystem
   
   type component ItsPkiHttpSystem extends HttpTestAdapter{
   } // End of component ItsPkiHttpSystem
   
-  type component ItsPkiItssSystem extends ItsPkiSystem {
-    port LibItsGeoNetworking_TestSystem.AdapterControlPort acPort;
-    port LibItsGeoNetworking_TestSystem.UpperTesterPort utPort;
-    port GeoNetworkingPort geoNetworkingPort;
+  type component ItsPkiItssSystem extends ItsPkiSystem, ItsGeoNetworking {
   } // End of component ItsPkiItssSystem
   
   type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc {
+    //    port LibItsPki_TestSystem.AdapterControlPort acPkiPort;
     port PkiPort pkiPort;
     
     var Certificate vc_eaCertificate;       /** Test Adapter EA certificate */
@@ -77,6 +76,7 @@ module LibItsPki_TestSystem {
   
   type component ItsPkiItss extends ItsGeoNetworking {
     port PkiPort pkiPort;
+    //    port LibItsPki_TestSystem.AdapterControlPort acPkiPort;
   } // End of component ItsPkiItss
   
 } // End of module LibItsPki_TestSystem 

ttcn/Pki/LibItsPki_TypesAndValues.ttcn

@@ -30,6 +30,7 @@ module LibItsPki_TypesAndValues {
     
     type record AcSetSecurityData {
       charstring  certificateId,
+      charstring  peer_certificateId,
       octetstring private_key,
       octetstring public_key_compressed,
       integer     public_key_compressed_mode