From 98da41ff60f187be6e7906d61886410c4d565071 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Fri, 20 May 2022 13:50:53 +0200
Subject: experimental implementation of Elliptic Curve Public Key Encoding
 with X9.62 compressed and uncompressed

---
 .../org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/main/java/org/uic/barcode/dynamicFrame')

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
index ae1b4e2..15f169b 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -8,8 +8,6 @@ import java.security.Provider;
 import java.security.PublicKey;
 import java.security.Signature;
 import java.security.SignatureException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
 import java.util.Date;
 
 import org.uic.barcode.dynamicContent.api.DynamicContentCoder;
@@ -20,6 +18,7 @@ import org.uic.barcode.dynamicFrame.v1.DynamicFrameCoderV1;
 import org.uic.barcode.dynamicFrame.v2.DynamicFrameCoderV2;
 import org.uic.barcode.ticket.EncodingFormatException;
 import org.uic.barcode.utils.AlgorithmNameResolver;
+import org.uic.barcode.utils.ECKeyEncoder;
 import org.uic.barcode.utils.SecurityUtils;
 
 
@@ -180,15 +179,12 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			} 
 			KeyFactory keyFactory = KeyFactory.getInstance(keyAlgName,provider);
 			if (keyFactory != null) {
-				X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
-				key = keyFactory.generatePublic(keySpec);
+				key = ECKeyEncoder.fromEncoded(keyBytes,level2KeyAlg, provider);
 			} else {
 				return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
 			}
 			
-		} catch (InvalidKeySpecException e1) {
-			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
-		} catch (NoSuchAlgorithmException e1) {
+		} catch (Exception e1) {
 			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
 		}
 		
-- 
cgit v1.2.3