From 6ef85723cca938e298b318dc6d564318b83ab4ba Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 11 Apr 2022 16:30:32 +0200
Subject: use one provider only within validation

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

(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 ef31166..a8d7a0f 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -272,6 +272,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
 		}
 		
+		
 		byte[] signature = this.getLevel2Data().getLevel1Signature();
 
 	
@@ -288,7 +289,13 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 				
 		if (signingAlgorithmOid == null || signingAlgorithmOid.length() == 0) {
 			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
-		}				
+		}		
+		
+		if (prov == null) {
+			prov = SecurityUtils.findSignatureProvider(key.getEncoded(), signingAlgorithmOid);
+		}
+
+		
 		//find the algorithm name for the signature OID
 		String algo = null;
 		try {
@@ -312,6 +319,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}
 		try {
+			key = SecurityUtils.convert(key, prov);
 			sig.initVerify(key);
 		} catch (InvalidKeyException e) {
 			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
-- 
cgit v1.2.3