From 28696b6d5f867e22066ae1ca817502769126054a Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Thu, 30 Nov 2023 10:23:53 +0100
Subject: Bug Fix - DynamirFrame version 2 was not detected during decoding

---
 .../java/org/uic/barcode/dynamicFrame/api/DynamicFrameCoder.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/api/DynamicFrameCoder.java b/src/main/java/org/uic/barcode/dynamicFrame/api/DynamicFrameCoder.java
index 53efb3e..091cd4c 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/DynamicFrameCoder.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/DynamicFrameCoder.java
@@ -49,10 +49,10 @@ public class DynamicFrameCoder {
 			
 			if (frame.getFormat() != null && frame.getFormat().equals(Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1)) {
 				return frame;
-			} 
-		} catch(Exception e1) {
+			} 		
+		} catch (Throwable e) {
 		    frame = null;
-			// failed, try next 
+			// failed, try next 			
 		}
 		
 		frame = new SimpleDynamicFrame();
@@ -62,7 +62,7 @@ public class DynamicFrameCoder {
 			if (frame.getFormat() != null && frame.getFormat().equals(Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2)) {
 				return frame;
 			} 
-		} catch(Exception e1) {
+		} catch(Throwable e) {
 			throw new EncodingFormatException("Dynamic Header Version not supported");
 			// failed
 		}
-- 
cgit v1.2.3


From 9cc50a7d4fb16bd82db5d3a79864b219ab6faa63 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Thu, 30 Nov 2023 10:31:32 +0100
Subject: deprecated function without dedicated security provider

---
 src/main/java/org/uic/barcode/Decoder.java | 3 +++
 src/main/java/org/uic/barcode/Encoder.java | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'src/main/java')

diff --git a/src/main/java/org/uic/barcode/Decoder.java b/src/main/java/org/uic/barcode/Decoder.java
index 637bbf6..0878d8d 100644
--- a/src/main/java/org/uic/barcode/Decoder.java
+++ b/src/main/java/org/uic/barcode/Decoder.java
@@ -82,6 +82,7 @@ public class Decoder {
 	 * @throws UnsupportedOperationException the unsupported operation exception
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 * @throws EncodingFormatException the encoding format exception
+	 * @deprecated
 	 */
 	public int validateLevel1(PublicKey key) throws InvalidKeyException, NoSuchAlgorithmException, SignatureException, IllegalArgumentException, UnsupportedOperationException, IOException, EncodingFormatException {
 		if (dynamicFrame != null) {
@@ -115,6 +116,7 @@ public class Decoder {
 	 * @throws UnsupportedOperationException the unsupported operation exception
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 * @throws EncodingFormatException the encoding format exception
+	 * @deprecated
 	 */
 	public int validateLevel1(PublicKey key, String signingAlg) throws InvalidKeyException, NoSuchAlgorithmException, SignatureException, IllegalArgumentException, UnsupportedOperationException, IOException, EncodingFormatException {
 		if (dynamicFrame != null ) {
@@ -177,6 +179,7 @@ public class Decoder {
 	 *
 	 * @return the return code indicating errors
 	 * @throws EncodingFormatException 
+	 * @deprecated
 	 */
 	public int validateLevel2() throws EncodingFormatException {
 		if (!isStaticHeader(data) && dynamicFrame != null) {
diff --git a/src/main/java/org/uic/barcode/Encoder.java b/src/main/java/org/uic/barcode/Encoder.java
index f8dae02..3eb2faf 100644
--- a/src/main/java/org/uic/barcode/Encoder.java
+++ b/src/main/java/org/uic/barcode/Encoder.java
@@ -234,6 +234,7 @@ public class Encoder {
 	 *     
 	 * @param key the key
 	 * @throws Exception the exception
+	 * @deprecated
 	 */
 	public void signLevel2(PrivateKey key) throws Exception {
 		if (dynamicFrame != null) {
@@ -367,6 +368,7 @@ public class Encoder {
 	 * @param signingAlg the signing algorithm (OID)
 	 * @param keyId the key id
 	 * @throws Exception the exception
+	 * @deprecated
 	 */
 	public void signLevel1(String securityProvider,PrivateKey key,String signingAlg, String keyId) throws Exception {
 		if (dynamicFrame != null) {
-- 
cgit v1.2.3