From 09f0f9449a10b713207126348105fafec4781bed Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 24 Jan 2022 16:51:04 +0100
Subject: signature validation changed to work with teh dynamic header version
 2.

---
 .../uic/barcode/utils/AlgorithmNameResolver.java   | 37 ++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/uic/barcode/utils/AlgorithmNameResolver.java')

diff --git a/src/main/java/org/uic/barcode/utils/AlgorithmNameResolver.java b/src/main/java/org/uic/barcode/utils/AlgorithmNameResolver.java
index 4491358..a3154f3 100644
--- a/src/main/java/org/uic/barcode/utils/AlgorithmNameResolver.java
+++ b/src/main/java/org/uic/barcode/utils/AlgorithmNameResolver.java
@@ -24,6 +24,26 @@ public class AlgorithmNameResolver {
     	
     }
     
+    public static String getSignatureAlgorithmName (String oid, Provider provider) throws Exception {
+    	
+    	if (provider != null) {
+    		 Service service = provider.getService(AlgorithmNameResolver.TYPE_SIGNATURE_ALG,oid);
+    		 return service.getAlgorithm();
+    	}
+    	
+    	
+ 		Provider[] provs = Security.getProviders();
+ 		for (Provider prov : provs) {
+ 		       Service service = prov.getService(AlgorithmNameResolver.TYPE_SIGNATURE_ALG,oid);
+ 		       if (service != null) {
+	    		   return service.getAlgorithm();
+ 		       }
+ 		}
+ 		return null;
+     	
+     }
+    
+    
     public static String getName (String type, String oid) throws Exception {
     	
 		Provider[] provs = Security.getProviders();
@@ -45,9 +65,22 @@ public class AlgorithmNameResolver {
     }
     	
     
-   public static String getName(String type, String oid, Provider prov) throws Exception {
+   public static String getName(String type, String oid, Provider provider) throws Exception {
+	   
+	   Service service = null;
+	   if (provider == null) {
+		   
+			Provider[] provs = Security.getProviders();
+			for (Provider prov : provs) {
+			       service = prov.getService(type,oid);
+			}	   
+		   
+	   } else {
+		   service = provider.getService(type,oid);
+	   }
+	   
 	   
-       	Service service = prov.getService(type,oid);
+       	
        	if (service != null) {
     	   return service.getAlgorithm();
        	}
-- 
cgit v1.2.3