From e670f1fdbc43f0d0854896a1afe2815f8a9f4c87 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 11 Apr 2022 15:06:48 +0200
Subject: fixing DOSIPAS algorithm names and supported EC curves

---
 .../dynamicFrame/api/SimpleDynamicFrame.java       | 43 +++++++++++++++++-----
 1 file changed, 34 insertions(+), 9 deletions(-)

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

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 a05a936..ef31166 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -20,6 +20,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.SecurityUtils;
 
 
 
@@ -132,13 +133,15 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * 
 	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
 	 *
-	 * @param prov the registered security provider
+	 * @param provider the registered security provider
 	 * @return the return error code
 	 * @throws EncodingFormatException 
 	 */	
 	@Override
 	public int validateLevel2(Provider prov) throws EncodingFormatException {
 		
+		Provider provider = prov;
+		
 		if (getLevel2Data() == null
 				|| getLevel2Data().getLevel1Data() == null 
 				|| getLevel2Data().getLevel1Data().getLevel2KeyAlg() == null
@@ -159,7 +162,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 					
 		String keyAlgName = null;
 		try {
-			keyAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_KEY_GENERATOR_ALG, level2KeyAlg,prov);
+			keyAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_KEY_GENERATOR_ALG, level2KeyAlg,provider);
 		} catch (Exception e1) {
 			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
 		}
@@ -171,7 +174,20 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		try {
 			byte[] keyBytes = this.getLevel2Data().getLevel1Data().getLevel2publicKey();
 			X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
-			key = KeyFactory.getInstance(keyAlgName).generatePublic(keySpec);
+			
+			KeyFactory keyFactory = null;
+			if (provider == null) {
+				keyFactory = SecurityUtils.findKeyFactory(level2KeyAlg, keyBytes);
+				provider = keyFactory.getProvider();
+			} else {
+				keyFactory = KeyFactory.getInstance(keyAlgName,provider);
+			}
+			if (keyFactory != null) {
+				key = keyFactory.generatePublic(keySpec);
+			} else {
+				return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
+			}
+			
 		} catch (InvalidKeySpecException e1) {
 			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
 		} catch (NoSuchAlgorithmException e1) {
@@ -183,7 +199,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 
 		String sigAlgName = null;
 		try {
-			sigAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_SIGNATURE_ALG,level2SigAlg,prov);
+			sigAlgName = AlgorithmNameResolver.getSignatureAlgorithmName(level2SigAlg,provider);
 		} catch (Exception e1) {
 			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}
@@ -191,12 +207,12 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}
 		
-		Signature sig;
+		Signature sig = null;
 		try {
-			if (prov == null) {
+			if (provider == null) {
 				sig = Signature.getInstance(sigAlgName);
 			} else {
-				sig = Signature.getInstance(sigAlgName, prov);
+				sig = Signature.getInstance(sigAlgName,provider);
 			}
 		} catch (NoSuchAlgorithmException e) {
 			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
@@ -321,7 +337,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			} else {
 				return Constants.LEVEL1_VALIDATION_FRAUD;
 			}
-		} catch (SignatureException e) {
+		} catch (Exception e) {
 			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}
 	}
@@ -344,6 +360,9 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		//find the algorithm name for the signature OID
 		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(this.getLevel2Data().getLevel1Data().getLevel2SigningAlg(), prov);
 		Signature sig = null;
+		if (prov == null) {
+			prov = SecurityUtils.findPrivateKeyProvider(key);
+		}
 		if (prov != null) {
 			sig = Signature.getInstance(algo,prov);
 		} else {
@@ -438,10 +457,16 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		ILevel1Data level1Data = level2Data.getLevel1Data();
 		
 		if (level1Data == null) return;
+
+		if (prov == null) {
+			//check for a provider supporting the key
+			prov = SecurityUtils.findPrivateKeyProvider(key);
+		}
 		
 		//find the algorithm name for the signature OID
-		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(level1Data.getLevel1SigningAlg());
+		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(level1Data.getLevel1SigningAlg(), prov);
 		Signature sig = null;
+
 		if (prov != null) {
 			sig = Signature.getInstance(algo, prov);
 		} else {
-- 
cgit v1.2.3