From 8770b99fdb6f47dea7b1f598633407e67b22572f Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Thu, 14 Apr 2022 15:09:45 +0200
Subject: - improved encoding of numerical values outside the allowed range -
 additional unit tests - fixes in the unused version 2 of FCB

---
 .../uic/barcode/dynamicFrame/v1/DynamicFrame.java  | 38 ----------------------
 1 file changed, 38 deletions(-)

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

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v1/DynamicFrame.java b/src/main/java/org/uic/barcode/dynamicFrame/v1/DynamicFrame.java
index 3bfcbf5..7dbd131 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v1/DynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v1/DynamicFrame.java
@@ -122,44 +122,6 @@ public class DynamicFrame extends Object{
 		return UperEncoder.decode(bytes, DynamicFrame.class);	
 	}
 	
-	/**
-	 * 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());
-		
-	}
-
 	
 	/**
 	 * Adds the dynamic content and encodes it. (API level)
-- 
cgit v1.2.3


From 2ecd0bdcbd06e580671ebf16904655a2a56ddba5 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 2 May 2022 10:00:40 +0200
Subject: search for the provider prior to the algorithm name

---
 .../java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 59ccd52..ae1b4e2 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -361,13 +361,15 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 */
 	@Override
 	public void signLevel2(PrivateKey key, Provider prov) throws Exception {
+
+		if (prov == null) {
+			prov = SecurityUtils.findPrivateKeyProvider(key);
+		}
 		
 		//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 {
-- 
cgit v1.2.3