Merged branches/Security/t3plugins (r1425-1803) to trunk.

9caa1af3 · berge · 4a7a5d77 · 9caa1af3 · 9caa1af3 · 9caa1af3
Commit 9caa1af3 authored Nov 18, 2014 by berge
--- a/tt3plugins/EtsiItsAdapter/JSon/gson-2.3.jar
+++ b/tt3plugins/EtsiItsAdapter/JSon/gson-2.3.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/CryptoLib.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/CryptoLib.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/bcprov-jdk16-146.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/bcprov-jdk16-146.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/commons-codec-1.4.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/commons-codec-1.4.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/de.fraunhofer.sit.c2x.pki.ca.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/de.fraunhofer.sit.c2x.pki.ca.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/de.fraunhofer.sit.c2x.pki.etsi_ts103097v1114.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/de.fraunhofer.sit.c2x.pki.etsi_ts103097v1114.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/de.fraunhofer.sit.c2x.pki.libs.custom-guice.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/de.fraunhofer.sit.c2x.pki.libs.custom-guice.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/joda-time-2.0.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/joda-time-2.0.jar
--- a/tt3plugins/EtsiItsAdapter/Preserve/pax-logging-api-1.6.10.jar
+++ b/tt3plugins/EtsiItsAdapter/Preserve/pax-logging-api-1.6.10.jar
--- a/tt3plugins/EtsiItsAdapter/TT3plugin.xml
+++ b/tt3plugins/EtsiItsAdapter/TT3plugin.xml
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.its.adapter" name="ETSI Its Adapter" provider-name="ETSI" version="1.0.0.0">
  <runtime>
    <library name="EtsiItsAdapter.jar"/>
+    <library name="JSon/gson-2.3.jar"/>
    <library name="jnetpcap-1.3.0/jnetpcap.jar"/>
+    <library name="Preserve/CryptoLib.jar"/>
+    <library name="Preserve/bcprov-jdk16-146.jar"/>
+    <library name="Preserve/de.fraunhofer.sit.c2x.pki.ca.jar"/>
+    <library name="Preserve/de.fraunhofer.sit.c2x.pki.etsi_ts103097v1114.jar"/>
+    <library name="Preserve/commons-codec-1.4.jar"/>
    <library name="../../build"/>
+    <native path="JSon"/>
    <native path="jnetpcap-1.3.0"/>
+    <native path="Preserve"/>
  </runtime>
  <dependency>
    <reference id="org.etsi.adapter"/>

--- a/tt3plugins/LibItsCam_asn1/TT3plugin.xml
+++ b/tt3plugins/LibItsCam_asn1/TT3plugin.xml
@@ -15,6 +15,8 @@
    </dependency>

 	<extension point="com.testingtech.ttcn.extension.CodecProvider">
+		<parameter id="name" value="LibItsCam_asn1 PER-CANONICAL-UNALIGNED:1997 ASN.1 Codec"/>
+		<parameter id="description" value="Generated ASN.1 PER-CANONICAL-UNALIGNED:1997 codec for modules ITS_Container CAM_PDU_Descriptions"/>
 		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.LibItsCam_asn1PERCanonicalUnalignedCodecProvider"/>
 		<parameter id="asn-encoding" value="PER-CANONICAL-UNALIGNED:1997"/>
        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.Libitscam_asn1"/>
@@ -25,6 +27,8 @@
 	</extension>

 	<extension point="com.testingtech.ttcn.extension.CodecProvider">
+		<parameter id="name" value="LibItsCam_asn1 PER-BASIC-UNALIGNED:1997 ASN.1 Codec"/>
+		<parameter id="description" value="Generated ASN.1 PER-BASIC-UNALIGNED:1997 codec for modules ITS_Container CAM_PDU_Descriptions"/>
 		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.LibItsCam_asn1PERBasicUnalignedCodecProvider"/>
 		<parameter id="asn-encoding" value="PER-BASIC-UNALIGNED:1997"/>
        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.Libitscam_asn1"/>
@@ -34,25 +38,5 @@
        </parameter>
 	</extension>

-	<extension point="com.testingtech.ttcn.extension.CodecProvider">
-		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.LibItsCam_asn1PERCanonicalAlignedCodecProvider"/>
-		<parameter id="asn-encoding" value="PER-CANONICAL-ALIGNED:1997"/>
-        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.Libitscam_asn1"/>
-        <parameter id="modules">
-          <parameter id="module" value="ITS_Container"/>
-          <parameter id="module" value="CAM_PDU_Descriptions"/>
-        </parameter>
-	</extension>
-
-	<extension point="com.testingtech.ttcn.extension.CodecProvider">
-		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.LibItsCam_asn1PERBasicAlignedCodecProvider"/>
-		<parameter id="asn-encoding" value="PER-BASIC-ALIGNED:1997"/>
-        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1.Libitscam_asn1"/>
-        <parameter id="modules">
-          <parameter id="module" value="ITS_Container"/>
-          <parameter id="module" value="CAM_PDU_Descriptions"/>
-        </parameter>
-	</extension>
-

 </plugin>
--- a/tt3plugins/LibItsCam_asn1/lib/LibItsCam_asn1.jar
+++ b/tt3plugins/LibItsCam_asn1/lib/LibItsCam_asn1.jar
--- a/tt3plugins/LibItsCdd_asn1/TT3plugin.xml
+++ b/tt3plugins/LibItsCdd_asn1/TT3plugin.xml
@@ -15,6 +15,8 @@
    </dependency>

 	<extension point="com.testingtech.ttcn.extension.CodecProvider">
+		<parameter id="name" value="LibItsCdd_asn1 PER-CANONICAL-UNALIGNED:1997 ASN.1 Codec"/>
+		<parameter id="description" value="Generated ASN.1 PER-CANONICAL-UNALIGNED:1997 codec for modules ITS_Container"/>
 		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsCdd_asn1.LibItsCdd_asn1PERCanonicalUnalignedCodecProvider"/>
 		<parameter id="asn-encoding" value="PER-CANONICAL-UNALIGNED:1997"/>
        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsCdd_asn1.Libitscdd_asn1"/>
@@ -24,6 +26,8 @@
 	</extension>

 	<extension point="com.testingtech.ttcn.extension.CodecProvider">
+		<parameter id="name" value="LibItsCdd_asn1 PER-BASIC-UNALIGNED:1997 ASN.1 Codec"/>
+		<parameter id="description" value="Generated ASN.1 PER-BASIC-UNALIGNED:1997 codec for modules ITS_Container"/>
 		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsCdd_asn1.LibItsCdd_asn1PERBasicUnalignedCodecProvider"/>
 		<parameter id="asn-encoding" value="PER-BASIC-UNALIGNED:1997"/>
        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsCdd_asn1.Libitscdd_asn1"/>

--- a/tt3plugins/LibItsCdd_asn1/lib/LibItsCdd_asn1.jar
+++ b/tt3plugins/LibItsCdd_asn1/lib/LibItsCdd_asn1.jar
--- a/tt3plugins/LibItsDenm_asn1/TT3plugin.xml
+++ b/tt3plugins/LibItsDenm_asn1/TT3plugin.xml
@@ -15,6 +15,8 @@
    </dependency>

 	<extension point="com.testingtech.ttcn.extension.CodecProvider">
+		<parameter id="name" value="LibItsDenm_asn1 PER-CANONICAL-UNALIGNED:1997 ASN.1 Codec"/>
+		<parameter id="description" value="Generated ASN.1 PER-CANONICAL-UNALIGNED:1997 codec for modules DENM_PDU_Descriptions ITS_Container"/>
 		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.LibItsDenm_asn1PERCanonicalUnalignedCodecProvider"/>
 		<parameter id="asn-encoding" value="PER-CANONICAL-UNALIGNED:1997"/>
        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.Libitsdenm_asn1"/>
@@ -25,6 +27,8 @@
 	</extension>

 	<extension point="com.testingtech.ttcn.extension.CodecProvider">
+		<parameter id="name" value="LibItsDenm_asn1 PER-BASIC-UNALIGNED:1997 ASN.1 Codec"/>
+		<parameter id="description" value="Generated ASN.1 PER-BASIC-UNALIGNED:1997 codec for modules DENM_PDU_Descriptions ITS_Container"/>
 		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.LibItsDenm_asn1PERBasicUnalignedCodecProvider"/>
 		<parameter id="asn-encoding" value="PER-BASIC-UNALIGNED:1997"/>
        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.Libitsdenm_asn1"/>
@@ -34,25 +38,5 @@
        </parameter>
 	</extension>

-	<extension point="com.testingtech.ttcn.extension.CodecProvider">
-		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.LibItsDenm_asn1PERCanonicalAlignedCodecProvider"/>
-		<parameter id="asn-encoding" value="PER-CANONICAL-ALIGNED:1997"/>
-        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.Libitsdenm_asn1"/>
-        <parameter id="modules">
-          <parameter id="module" value="DENM_PDU_Descriptions"/>
-          <parameter id="module" value="ITS_Container"/>
-        </parameter>
-	</extension>
-
-	<extension point="com.testingtech.ttcn.extension.CodecProvider">
-		<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.LibItsDenm_asn1PERBasicAlignedCodecProvider"/>
-		<parameter id="asn-encoding" value="PER-BASIC-ALIGNED:1997"/>
-        <parameter id="project-name" value="org.etsi.its.codec.tool.testingtech.LibItsDenm_asn1.Libitsdenm_asn1"/>
-        <parameter id="modules">
-          <parameter id="module" value="DENM_PDU_Descriptions"/>
-          <parameter id="module" value="ITS_Container"/>
-        </parameter>
-	</extension>
-

 </plugin>
--- a/tt3plugins/LibItsDenm_asn1/lib/LibItsDenm_asn1.jar
+++ b/tt3plugins/LibItsDenm_asn1/lib/LibItsDenm_asn1.jar
--- a/tt3plugins/TT_TestSystem/TT3plugin.xml
+++ b/tt3plugins/TT_TestSystem/TT3plugin.xml
@@ -190,6 +190,24 @@
        <parameter id="default" value="32000"/>
        <parameter id="description" value="V2gSeccPort"/>
      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsSecuredMode"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="false"/>
+        <parameter id="description" value="Secured mode status"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsSecuredRootPath"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value=""/>
+        <parameter id="description" value="Secured root path to access certificates and private keys"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsSecuredConfiId"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value=""/>
+        <parameter id="description" value="Secured configuration identifier"/>
+      </parameter>
    </parameter>
    <parameter id="name" value="ITS System Adapter"/>
    <parameter id="description" value="The ITS System Adapter providing the communication functionality to and from the SUT."/>