ttcn/Pki/LibItsPki_TestSystem.ttcn

@@ -37,24 +37,34 @@ module LibItsPki_TestSystem {
   // LibItsGeoNetworking
   import from LibItsGeoNetworking_TestSystem all;
   
+  // LibItsPki
+  import from LibItsPki_TypesAndValues all;
+  
+  /**
+   * @desc Adapter control port
+   */
+  //  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 */
@@ -66,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

+/**
+ *  @author   ETSI / STF545
+ *  @version  $URL$
+ *            $Id$
+ *  @desc     Module containing templates for IT PKI Protocol
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
+ */
+module LibItsPki_TypesAndValues {
+  
+  group acPrimitives {
+        
+    /**
+     * @desc    TA primitives for Pki
+     */
+    type union AcPkiPrimitive {
+      AcSetSecurityData acSetSecurityData
+    } with {
+      variant ""
+    }
+        
+    /**
+     * @desc    Primitive for receiveing response from TA
+     */
+    type union AcPkiResponse {
+      boolean     result
+    }
+    
+    type record AcSetSecurityData {
+      charstring  certificateId,
+      charstring  peer_certificateId,
+      octetstring private_key,
+      octetstring public_key_compressed,
+      integer     public_key_compressed_mode
+    } with {
+      variant ""
+      encode "LibItsPki"
+    } // AcSetSecurityData
+    
+  } // end acPrimitives
+  with {
+    variant ""
+    encode "AdapterControl"
+    }
+}
+with {
+  variant ""
+  encode "LibItsPki"
+}   // End of module LibItsPki_TypesAndValues