update IAIK libs

8 files changed, 12 insertions, 9 deletions

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index fe6ea0c47..6cf5d41b3 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>MOA.spss.server</groupId>
 			<artifactId>moa-sig-lib</artifactId>
-			<version>3.1.0</version>
+			<version>3.1.1</version>
 			<exclusions>
 				<exclusion> 
 					<groupId>commons-logging</groupId>
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>MOA.spss</groupId>
 			<artifactId>common</artifactId>
-			<version>3.1.0</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>MOA.spss</groupId>
@@ -90,13 +90,16 @@
 		<dependency>
 			<groupId>iaik.prod</groupId>
 			<artifactId>iaik_eccelerate</artifactId>
-			<version>3.1_eval</version>
+			<version>4.02_eval</version>
 		</dependency>		
-		<dependency>
+
+<!-- Removed, because there is an incompatibility with iaik_eccelerate 4.02_eval -->
+<!-- 		<dependency>
 			<groupId>iaik.prod</groupId>
 			<artifactId>iaik_eccelerate_addon</artifactId>
 			<version>3.01_eval</version>
-		</dependency>							
+		</dependency>	 -->
+								
 		<dependency>
 			<groupId>iaik.prod</groupId>
 			<artifactId>iaik_eccelerate_cms</artifactId>
@@ -115,12 +118,12 @@
 		<dependency>
     	<groupId>iaik.prod</groupId>
       <artifactId>iaik_moa</artifactId>
-      <version>2.04</version>
+      <version>2.05</version>
     </dependency>		
 		<dependency>
 			<groupId>iaik.prod</groupId>
 			<artifactId>iaik_pki_module</artifactId>
-			<version>1.02_moa</version>
+			<version>1.03_moa</version>
 		</dependency>		
 		<dependency>
 			<groupId>iaik.prod</groupId>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
index f37ae0b0b..d30ce4924 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
@@ -44,9 +44,9 @@ import iaik.security.ec.common.ECParameterSpec;
 import iaik.security.ec.common.ECPublicKey;
 import iaik.security.ec.common.ECStandardizedParameterFactory;
 import iaik.security.ec.common.EllipticCurve;
+import iaik.security.ec.math.field.AbstractPrimeField;
 import iaik.security.ec.math.field.Field;
 import iaik.security.ec.math.field.FieldElement;
-import iaik.security.ec.math.field.PrimeField;
 
 public class ECDSAKeyValueConverter
 { 
@@ -221,7 +221,7 @@ public class ECDSAKeyValueConverter
 
 //    Value xValue = FieldFactory.getInstance().getPrimeFieldValue(new BigInteger(publicKeyXStr, 10));
 //    publicKeyPointX = field.newElement(xValue);
-    PrimeField pf = (PrimeField) field;
+    AbstractPrimeField pf = (AbstractPrimeField) field;
     publicKeyPointX = pf.newElement(new BigInteger(publicKeyXStr, 10));
 //    Value yValue = FieldFactory.getInstance().getPrimeFieldValue(new BigInteger(publicKeyYStr, 10));
 //    publicKeyPointY = field.newElement(yValue);
diff --git a/repository/MOA/spss/common/3.1.1/common-3.1.1.jar b/repository/MOA/spss/common/3.1.1/common-3.1.1.jar
new file mode 100644
index 000000000..a83531535
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.1/common-3.1.1.jar
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.1/moa-sig-lib-3.1.1.jar b/repository/MOA/spss/server/moa-sig-lib/3.1.1/moa-sig-lib-3.1.1.jar
new file mode 100644
index 000000000..8d11602cf
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.1/moa-sig-lib-3.1.1.jar
diff --git a/repository/iaik/prod/iaik_eccelerate/4.02_eval/iaik_eccelerate-4.02_eval.jar b/repository/iaik/prod/iaik_eccelerate/4.02_eval/iaik_eccelerate-4.02_eval.jar
new file mode 100644
index 000000000..9727ab3a0
--- /dev/null
+++ b/repository/iaik/prod/iaik_eccelerate/4.02_eval/iaik_eccelerate-4.02_eval.jar
diff --git a/repository/iaik/prod/iaik_jce_full/5.5_MOA_RC3/iaik_jce_full-5.5_MOA_RC3.jar b/repository/iaik/prod/iaik_jce_full/5.5_MOA_RC3/iaik_jce_full-5.5_MOA_RC3.jar
new file mode 100644
index 000000000..f86ded1b4
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/5.5_MOA_RC3/iaik_jce_full-5.5_MOA_RC3.jar
diff --git a/repository/iaik/prod/iaik_moa/2.05/iaik_moa-2.05.jar b/repository/iaik/prod/iaik_moa/2.05/iaik_moa-2.05.jar
new file mode 100644
index 000000000..51dc3f045
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/2.05/iaik_moa-2.05.jar
diff --git a/repository/iaik/prod/iaik_pki_module/1.03_moa/iaik_pki_module-1.03_moa.jar b/repository/iaik/prod/iaik_pki_module/1.03_moa/iaik_pki_module-1.03_moa.jar
new file mode 100644
index 000000000..e30f05843
--- /dev/null
+++ b/repository/iaik/prod/iaik_pki_module/1.03_moa/iaik_pki_module-1.03_moa.jar