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.

---
 src/main/java/org/uic/barcode/Decoder.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/org/uic/barcode/Decoder.java b/src/main/java/org/uic/barcode/Decoder.java
index b980f19..5cb0546 100644
--- a/src/main/java/org/uic/barcode/Decoder.java
+++ b/src/main/java/org/uic/barcode/Decoder.java
@@ -81,7 +81,7 @@ public class Decoder {
 	 */
 	public int validateLevel1(PublicKey key, String signingAlg) throws InvalidKeyException, NoSuchAlgorithmException, SignatureException, IllegalArgumentException, UnsupportedOperationException, IOException, EncodingFormatException {
 		if (!isStaticHeader(data)) {
-			return dynamicFrame.validateLevel1(key) ;
+			return dynamicFrame.validateLevel1(key, data) ;
 		} else {
 			if (staticFrame.verifyByAlgorithmOid(key,signingAlg)) {
 				return Constants.LEVEL1_VALIDATION_OK;
@@ -91,7 +91,6 @@ public class Decoder {
 		}
 	}
 	
-	
 	/**
 	 * Validate level 1.
 	 *
@@ -109,7 +108,7 @@ public class Decoder {
 	 */
 	public int validateLevel1(PublicKey key, String signingAlg, Provider provider) throws InvalidKeyException, NoSuchAlgorithmException, SignatureException, IllegalArgumentException, UnsupportedOperationException, IOException, EncodingFormatException {
 		if (!isStaticHeader(data)) {
-			return dynamicFrame.validateLevel1(key, provider) ;
+			return dynamicFrame.validateLevel1(key, provider, data) ;
 		} else {
 			if (staticFrame.verifyByAlgorithmOid(key,signingAlg, provider)) {
 				return Constants.LEVEL1_VALIDATION_OK;
@@ -127,7 +126,7 @@ public class Decoder {
 	 */
 	public int validateLevel2() throws EncodingFormatException {
 		if (!isStaticHeader(data)) {
-			return dynamicFrame.validateLevel2() ;
+			return dynamicFrame.validateLevel2(null, data) ;
 		} else {
 			return Constants.LEVEL2_VALIDATION_NO_SIGNATURE;
 		}
@@ -140,7 +139,7 @@ public class Decoder {
 	 */
 	public int validateLevel2(Provider prov) throws EncodingFormatException {
 		if (!isStaticHeader(data)) {
-			return dynamicFrame.validateLevel2(prov) ;
+			return dynamicFrame.validateLevel2(prov,data) ;
 		} else {
 			return Constants.LEVEL2_VALIDATION_NO_SIGNATURE;
 		}
-- 
cgit v1.2.3