Workaround for finding EC OID if ECCelerate not loaded first

5 files changed, 12 insertions, 12 deletions

diff --git a/utils/src/main/java/at/gv/egiz/idlink/CompressedIdentityLinkFactory.java b/utils/src/main/java/at/gv/egiz/idlink/CompressedIdentityLinkFactory.java
index 510f303e..11908540 100644
--- a/utils/src/main/java/at/gv/egiz/idlink/CompressedIdentityLinkFactory.java
+++ b/utils/src/main/java/at/gv/egiz/idlink/CompressedIdentityLinkFactory.java
@@ -51,14 +51,14 @@ import org.w3c.dom.NodeList;
 import at.buergerkarte.namespaces.personenbindung._20020506_.CompressedIdentityLinkType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.AbstractPersonType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.IdentificationType;
-import at.gv.e_government.reference.namespace.persondata._20020228_.PersonNameType;
-import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.IdentificationType.Value;
+import at.gv.e_government.reference.namespace.persondata._20020228_.PersonNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PersonNameType.FamilyName;
-import at.gv.egiz.idlink.ans1.CitizenPublicKey;
-import at.gv.egiz.idlink.ans1.IdentityLink;
-import at.gv.egiz.idlink.ans1.PersonData;
-import at.gv.egiz.idlink.ans1.PhysicalPersonData;
+import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
+import at.gv.egiz.idlink.asn1.CitizenPublicKey;
+import at.gv.egiz.idlink.asn1.IdentityLink;
+import at.gv.egiz.idlink.asn1.PersonData;
+import at.gv.egiz.idlink.asn1.PhysicalPersonData;
 import at.gv.egiz.marshal.MarshallerFactory;
 import at.gv.egiz.xmldsig.KeyTypeNotSupportedException;
 import at.gv.egiz.xmldsig.KeyValueFactory;
@@ -201,7 +201,7 @@ public class CompressedIdentityLinkFactory {
    *           of the <code>certificates</code> list
    */
   public JAXBElement<CompressedIdentityLinkType> createCompressedIdentityLink(
-      at.gv.egiz.idlink.ans1.IdentityLink idLink,
+      at.gv.egiz.idlink.asn1.IdentityLink idLink,
       List<X509Certificate> certificates, String domainId) {
 
     at.gv.e_government.reference.namespace.persondata._20020228_.ObjectFactory prFactory = 
@@ -254,7 +254,7 @@ public class CompressedIdentityLinkFactory {
 
       X509Certificate certificate = certificates.get(__citizenPublicKey.getOnToken());
       PublicKey publicKey = certificate.getPublicKey();
-      
+
       JAXBElement<?> keyValue;
       try {
         keyValue = keyValueFactory.createKeyValue(publicKey);
diff --git a/utils/src/main/java/at/gv/egiz/idlink/ans1/CitizenPublicKey.java b/utils/src/main/java/at/gv/egiz/idlink/asn1/CitizenPublicKey.java
index 5e342b8d..f89511ff 100644
--- a/utils/src/main/java/at/gv/egiz/idlink/ans1/CitizenPublicKey.java
+++ b/utils/src/main/java/at/gv/egiz/idlink/asn1/CitizenPublicKey.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egiz.idlink.ans1;
+package at.gv.egiz.idlink.asn1;
 
 import java.math.BigInteger;
 
diff --git a/utils/src/main/java/at/gv/egiz/idlink/ans1/IdentityLink.java b/utils/src/main/java/at/gv/egiz/idlink/asn1/IdentityLink.java
index 6a250b9a..c2663971 100644
--- a/utils/src/main/java/at/gv/egiz/idlink/ans1/IdentityLink.java
+++ b/utils/src/main/java/at/gv/egiz/idlink/asn1/IdentityLink.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egiz.idlink.ans1;

+package at.gv.egiz.idlink.asn1;

 

 import iaik.asn1.ASN1Object;

 import iaik.asn1.ASN1Type;

diff --git a/utils/src/main/java/at/gv/egiz/idlink/ans1/PersonData.java b/utils/src/main/java/at/gv/egiz/idlink/asn1/PersonData.java
index 6204e370..786486f1 100644
--- a/utils/src/main/java/at/gv/egiz/idlink/ans1/PersonData.java
+++ b/utils/src/main/java/at/gv/egiz/idlink/asn1/PersonData.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egiz.idlink.ans1;
+package at.gv.egiz.idlink.asn1;
 
 import iaik.asn1.*;
 
diff --git a/utils/src/main/java/at/gv/egiz/idlink/ans1/PhysicalPersonData.java b/utils/src/main/java/at/gv/egiz/idlink/asn1/PhysicalPersonData.java
index 995a40f6..be92ac30 100644
--- a/utils/src/main/java/at/gv/egiz/idlink/ans1/PhysicalPersonData.java
+++ b/utils/src/main/java/at/gv/egiz/idlink/asn1/PhysicalPersonData.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egiz.idlink.ans1;
+package at.gv.egiz.idlink.asn1;
 
 import iaik.asn1.*;