From 58bafb860b060c609a01815657b4df22ce8fbffc Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:54:16 +0200
Subject: test on algorithm name resolver

---
 .../uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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

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 a8d7a0f..59ccd52 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -150,6 +150,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		}
 		
 		String level2KeyAlg = getLevel2Data().getLevel1Data().getLevel2KeyAlg();
+		String level2SigAlg = this.getLevel2Data().getLevel1Data().getLevel2SigningAlg();
 
 	 
 		if (level2KeyAlg == null || level2KeyAlg.length() == 0) {
@@ -173,16 +174,13 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		PublicKey key = null;
 		try {
 			byte[] keyBytes = this.getLevel2Data().getLevel1Data().getLevel2publicKey();
-			X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
 			
-			KeyFactory keyFactory = null;
 			if (provider == null) {
-				keyFactory = SecurityUtils.findKeyFactory(level2KeyAlg, keyBytes);
-				provider = keyFactory.getProvider();
-			} else {
-				keyFactory = KeyFactory.getInstance(keyAlgName,provider);
-			}
+				provider = SecurityUtils.findPublicKeyProvider(level2KeyAlg,keyBytes);
+			} 
+			KeyFactory keyFactory = KeyFactory.getInstance(keyAlgName,provider);
 			if (keyFactory != null) {
+				X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
 				key = keyFactory.generatePublic(keySpec);
 			} else {
 				return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
@@ -194,9 +192,8 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
 		}
 		
-		//find the algorithm name for the signature OID
-		String level2SigAlg = this.getLevel2Data().getLevel1Data().getLevel2SigningAlg();
 
+		//find the algorithm name for the signature OID
 		String sigAlgName = null;
 		try {
 			sigAlgName = AlgorithmNameResolver.getSignatureAlgorithmName(level2SigAlg,provider);
-- 
cgit v1.2.3