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

---
 .../dynamicFrame/api/SimpleDynamicFrame.java       | 15 +++---
 .../uic/barcode/dynamicFrame/v2/DynamicFrame.java  | 56 ----------------------
 2 files changed, 6 insertions(+), 65 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 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);
diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
index 55af066..30043c0 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
@@ -123,43 +123,6 @@ public class DynamicFrame extends Object{
 	}
 	
 	
-	/**
-	 * Sign level 2 data without a specific security provider.
-	 *
-	 * @param key the key
-	 * @throws Exception the exception
-	 */
-	public void signLevel2(PrivateKey key) throws Exception {
-		
-		//find the algorithm name for the signature OID
-		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(this.getLevel2SignedData().getLevel1Data().level2SigningAlg);
-		Signature sig = Signature.getInstance(algo);
-		sig.initSign(key);
-		byte[] data = level2SignedData.encode();
-		sig.update(data);
-		byte[] signature = sig.sign();
-		this.level2Signature = new OctetString(signature);
-		
-	}
-
-	/**
-	 * Sign level 2 data.
-	 *
-	 * @param key the key
-	 * @param prov the security Provider
-	 * @throws Exception the exception
-	 */
-	public void signLevel2(PrivateKey key, Provider prov) throws Exception {
-		
-		//find the algorithm name for the signature OID
-		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(this.getLevel2SignedData().getLevel1Data().level2SigningAlg);
-		Signature sig = Signature.getInstance(algo,prov);
-		sig.initSign(key);
-		byte[] data = level2SignedData.encode();
-		sig.update(data);
-		this.level2Signature = new OctetString(sig.sign());
-		
-	}
 
 	
 	/**
@@ -207,24 +170,5 @@ public class DynamicFrame extends Object{
 			
 	}
 	
-	/**
-	 * Gets the dynamic data FDC 1.
-	 *
-	 * @return the dynamic data FDC 1
-	 */
-	public UicDynamicContentDataFDC1 getDynamicDataFDC1() {
-		
-		if (this.getLevel2SignedData() == null || 
-			this.getLevel2SignedData().getLevel2Data() == null){
-			return null;
-		}
-		
-		if ( UicDynamicContentDataFDC1.getFormat().equals(this.getLevel2SignedData().getLevel2Data().getFormat())) {
-			return UperEncoder.decode(this.getLevel2SignedData().getLevel2Data().getByteData(), UicDynamicContentDataFDC1.class);		
-		}
-		return null;
-		
-	}
-	
 	
 }
-- 
cgit v1.2.3