From 17f05b763d70f350bad482df9378c571c2ebddf6 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Fri, 21 Jan 2022 18:19:36 +0100
Subject: new dynamic header version 2.0.0

---
 .../dynamicFrame/api/SimpleDynamicFrame.java       | 553 +++++++++++++++++++++
 1 file changed, 553 insertions(+)
 create mode 100644 src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java

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

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
new file mode 100644
index 0000000..4c5c879
--- /dev/null
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -0,0 +1,553 @@
+package org.uic.barcode.dynamicFrame.api;
+
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Date;
+
+import org.uic.barcode.dynamicContent.api.DynamicContentCoder;
+import org.uic.barcode.dynamicContent.api.IUicDynamicContent;
+import org.uic.barcode.dynamicContent.fdc1.UicDynamicContentDataFDC1;
+import org.uic.barcode.dynamicFrame.Constants;
+import org.uic.barcode.dynamicFrame.v1.DynamicFrameCoderV1;
+import org.uic.barcode.dynamicFrame.v2.DynamicFrameCoderV2;
+import org.uic.barcode.ticket.EncodingFormatException;
+import org.uic.barcode.utils.AlgorithmNameResolver;
+
+
+
+/**
+ * The DynamicHeader for bar codes 
+ * 
+ */
+public class SimpleDynamicFrame implements IDynamicFrame {
+	
+	/**
+	 * Instantiates a new dynamic frame.
+	 */
+	public SimpleDynamicFrame() {}
+	
+	public SimpleDynamicFrame(String format) {
+		this.format = format;
+	}
+
+	/** The format. */
+	public String format = Constants.DYNAMIC_BARCODE_FORMAT_DEFAULT;
+	
+	/** The level 2 signed data. */
+	/*level 2 data*/
+	public ILevel2Data level2Data;
+	
+	
+	/**  The signature of level 2 data. */
+	public byte[] level2Signature;
+	
+	public Date endOfValidity = null;
+	
+	/**
+	 * Gets the format.
+	 *
+	 * @return the format
+	 */
+	public String getFormat() {
+		return format;
+	}
+
+	/**
+	 * Sets the format.
+	 *
+	 * @param format the new format
+	 */
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	
+	/**
+	 * Gets the level 2 signed data.
+	 *
+	 * @return the level 2 signed data
+	 */
+	public ILevel2Data getLevel2Data() {
+		return level2Data;
+	}
+
+	/**
+	 * Sets the level 2 signed data.
+	 *
+	 * @param level2SignedData the new level 2 signed data
+	 */
+	public void setLevel2Data(ILevel2Data level2SignedData) {
+		this.level2Data = level2SignedData;
+	}
+
+	/**
+	 * Gets the level 2 signature.
+	 *
+	 * @return the level 2 signature
+	 */
+	public byte[] getLevel2Signature() {
+		return level2Signature;
+	}
+
+	/**
+	 * Sets the level 2 signature.
+	 *
+	 * @param level2Signature the new level 2 signature
+	 */
+	public void setLevel2Signature(byte[] level2Signature) {
+		this.level2Signature = level2Signature;
+	}
+
+	/**
+	 * Encode.
+	 * 
+	 * Encode the header as ASN.1 PER UNALIGNED byte array
+	 *
+	 * @return the byte[]
+	 * @throws EncodingFormatException 
+	 */
+	public byte[] encode() throws EncodingFormatException {
+			
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV1.encode(this);
+			
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV2.encode(this);
+			
+		}
+		
+		return null;
+	}
+	
+	private byte[] encode(ILevel1Data level1Data) throws EncodingFormatException {
+		
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV1.encode(level1Data);
+			
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV2.encode(level1Data);
+			
+		}
+		
+		return null;
+	}
+	
+	private byte[] encode(ILevel2Data level2SignedData2) throws EncodingFormatException {
+		
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV1.encode(level2SignedData2);
+			
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV2.encode(level2SignedData2);
+			
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * Decode.
+	 *
+	 * Decode the header from an ASN.1 PER UNALIGNED encoded byte array
+	 *
+	 * @param bytes the bytes
+	 * @return the dynamic header
+	 */
+	public void decode(byte[] bytes) {
+		
+		String format = getFormat(bytes);
+			
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			DynamicFrameCoderV1.decode(this,bytes);
+			
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
+		
+			DynamicFrameCoderV2.decode(this,bytes);
+			
+		}
+		
+		
+
+	}
+	
+
+
+	
+	/**
+	 * Checks if is static header.
+	 *
+	 * @param data the data
+	 * @return true, if is static header
+	 */
+	private static String getFormat(byte[] data) {
+		byte[] start = "U1".getBytes();
+		if (start[0] != data[0] || start[1]!= start[1]) {
+			return Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1;
+		}
+		start = "U2".getBytes();
+		if (start[0] != data[0] || start[1]!= start[1]) {
+			return Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2;
+		}
+		return null;
+	}
+	
+	/**
+	 * Verify the level 2 signature
+	 * 
+	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
+	 *
+	 * @return the int
+	 * @throws EncodingFormatException 
+	 */	
+	public int validateLevel2() throws EncodingFormatException {
+
+		return validateLevel2(null);
+	
+	}
+	
+	/**
+	 * Verify the level 2 signature
+	 * 
+	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
+	 *
+	 * @param prov the prov
+	 * @return the int
+	 * @throws EncodingFormatException 
+	 */	
+	public int validateLevel2(Provider prov) throws EncodingFormatException {
+		
+		
+		String level2KeyAlg = this.getLevel2Data().getLevel1Data().getLevel2KeyAlg();
+
+	 
+		if (level2KeyAlg == null || level2KeyAlg.length() == 0) {
+			return Constants.LEVEL2_VALIDATION_NO_KEY;
+		}
+		
+		if (level2Signature == null || level2Signature.length == 0) {
+			return Constants.LEVEL2_VALIDATION_NO_SIGNATURE;
+		}
+					
+		String keyAlgName = null;
+		try {
+			keyAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_KEY_GENERATOR_ALG, level2KeyAlg);
+		} catch (Exception e1) {
+			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
+		}
+		if (keyAlgName == null || keyAlgName.length() == 0) {
+			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
+		}
+		
+		PublicKey key = null;
+		try {
+			byte[] keyBytes = this.getLevel2Data().getLevel1Data().getLevel2publicKey();
+			X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
+			key = KeyFactory.getInstance(keyAlgName).generatePublic(keySpec);
+		} catch (InvalidKeySpecException e1) {
+			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
+		} catch (NoSuchAlgorithmException e1) {
+			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
+		}
+		
+		//find the algorithm name for the signature OID
+		String level2SigAlg = this.getLevel2Data().getLevel1Data().getLevel2SigningAlg();
+
+		String sigAlgName = null;
+		try {
+			sigAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_SIGNATURE_ALG,level2SigAlg);
+		} catch (Exception e1) {
+			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+		if (sigAlgName == null) {
+			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+		
+		Signature sig;
+		try {
+			if (prov == null) {
+				sig = Signature.getInstance(sigAlgName);
+			} else {
+				sig = Signature.getInstance(sigAlgName, prov);
+			}
+		} catch (NoSuchAlgorithmException e) {
+			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+		try {
+			sig.initVerify(key);
+		} catch (InvalidKeyException e) {
+			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+		
+		try {
+			byte[] data = encode(level2Data);
+			sig.update(data);
+		} catch (SignatureException e) {
+			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		} catch (IllegalArgumentException e) {
+			return Constants.LEVEL2_VALIDATION_ENCODING_ERROR;
+		} catch (UnsupportedOperationException e) {
+			return Constants.LEVEL2_VALIDATION_ENCODING_ERROR;
+		}
+		
+		byte[] signature = level2Signature;
+		try {
+			if (sig.verify(signature)){
+				return Constants.LEVEL2_VALIDATION_OK;
+			} else {
+				return Constants.LEVEL2_VALIDATION_FRAUD;
+			}
+		} catch (SignatureException e) {
+			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+  	}
+	
+	/**
+	 * Verify the level 1 signature
+	 * 
+	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
+	 *
+	 * @param key the key
+	 * @param prov the prov
+	 * @return the int
+	 * @throws EncodingFormatException 
+	 */
+	public int validateLevel1(PublicKey key, Provider prov) throws EncodingFormatException {
+		
+		if (level2Data == null) {
+			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
+		}
+		
+	
+		if (level2Data == null || 
+			level2Data.getLevel1Signature().length == 0) {
+			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
+		}
+		
+		byte[] signature = this.getLevel2Data().getLevel1Signature();
+				
+		//find the algorithm name for the signature OID
+		String algo = null;
+		try {
+			algo = AlgorithmNameResolver.getSignatureAlgorithmName(getLevel2Data().getLevel1Data().getLevel1SigningAlg());
+		} catch (Exception e1) {
+			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}	
+		if (algo == null) {
+			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+		
+		Signature sig;
+		try {
+			if (prov != null) {
+				sig = Signature.getInstance(algo, prov);
+			} else {
+				sig = Signature.getInstance(algo);
+
+			}
+		} catch (NoSuchAlgorithmException e) {
+			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+		try {
+			sig.initVerify(key);
+		} catch (InvalidKeyException e) {
+			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+		
+		try {
+			sig.update(encode(level2Data.getLevel1Data()));
+		} catch (SignatureException e) {
+			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		} catch (IllegalArgumentException e) {
+			return Constants.LEVEL1_VALIDATION_ENCODING_ERROR;
+		} catch (UnsupportedOperationException e) {
+			return Constants.LEVEL1_VALIDATION_ENCODING_ERROR;
+		}
+		
+
+		try {
+			if (sig.verify(signature)){
+				return Constants.LEVEL2_VALIDATION_OK;
+			} else {
+				return Constants.LEVEL2_VALIDATION_FRAUD;
+			}
+		} catch (SignatureException e) {
+			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+		}
+  	}
+	
+
+
+
+
+	/**
+	 * Verify the level 1 signature
+	 * 
+	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
+	 *
+	 * @param key the key
+	 * @return the int
+	 * @throws EncodingFormatException 
+	 */
+	public int validateLevel1(PublicKey key) throws EncodingFormatException {
+		
+		return validateLevel1(key, null);
+
+  	}
+	
+	/**
+	 * 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(level2Data.getLevel1Data().getLevel2SigningAlg());
+		Signature sig = Signature.getInstance(algo);
+		sig.initSign(key);
+		byte[] data = encode(level2Data);
+		sig.update(data);
+		level2Signature = sig.sign();
+		
+	}
+
+	/**
+	 * 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.getLevel2Data().getLevel1Data().getLevel2SigningAlg());
+		Signature sig = Signature.getInstance(algo,prov);
+		sig.initSign(key);
+		byte[] data = encode(level2Data);
+		sig.update(data);
+		level2Signature = sig.sign();
+		
+	}
+
+	
+	/**
+	 * Adds the dynamic content and encodes it. (API level)
+	 *
+	 * @param content the dynamic content
+	 * @throws EncodingFormatException the encoding format exception
+	 */
+	public void addDynamicContent(IUicDynamicContent content) throws EncodingFormatException {
+		
+		
+		level2Data.setLevel2Data(new SimpleData());
+		
+		level2Data.getLevel2Data().setFormat(DynamicContentCoder.dynamicContentDataFDC1);
+			
+		level2Data.getLevel2Data().setData(DynamicContentCoder.encode(content, DynamicContentCoder.dynamicContentDataFDC1));
+		
+	}
+	
+	/**
+	 * Adds the level 2 dynamic data. (ASN level)
+	 *
+	 * @param dynamicData the dynamic data
+	 */
+	public void addLevel2DynamicData(UicDynamicContentDataFDC1 dynamicData) {
+		this.getLevel2Data().setLevel2Data(dynamicData.getApiDataType());	
+	}
+	
+	/**
+	 * Gets the dynamic content.
+	 *
+	 * @return the dynamic content
+	 */
+	public IUicDynamicContent getDynamicContent() {
+		
+		if (this.getLevel2Data() == null || 
+				this.getLevel2Data().getLevel2Data() == null){
+				return null;
+		}
+		
+		return DynamicContentCoder.decode(level2Data.getLevel2Data().getData());
+			
+	}
+	
+
+	/**
+	 * Sign the contained data block.
+	 * 
+	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
+	 *
+	 * @param key the key
+	 * @return 
+	 * @return the byte[]
+	 * @throws Exception 
+	 */
+	public void signLevel1(PrivateKey key) throws Exception {
+		
+		if (level2Data == null) return;
+		
+		ILevel1Data level1Data = level2Data.getLevel1Data();
+		
+		if (level1Data == null) return;
+		
+		//find the algorithm name for the signature OID
+		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(level1Data.getLevel1SigningAlg());
+		Signature sig = Signature.getInstance(algo);
+		sig.initSign(key);
+		byte[] data = encode(level1Data);
+		sig.update(data);
+		level2Data.setLevel1Signature(sig.sign());
+	}
+
+	/**
+	 * Sign the contained data block.
+	 * 
+	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
+	 *
+	 * @param key the key
+	 * @param security provider - security provider that must be sued to create the signature
+	 * @return 
+	 * @return the byte[]
+	 * @throws Exception 
+	 */
+	@Override
+	public void signLevel1(PrivateKey key, Provider prov) throws Exception {
+		
+		if (level2Data == null) return;
+		
+		ILevel1Data level1Data = level2Data.getLevel1Data();
+		
+		if (level1Data == null) return;
+		
+		//find the algorithm name for the signature OID
+		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(level1Data.getLevel1SigningAlg());
+		Signature sig = Signature.getInstance(algo, prov);
+		sig.initSign(key);
+				
+		byte[] data = encode(level1Data);
+		sig.update(data);
+		level2Data.setLevel1Signature(sig.sign());	
+	}
+
+
+
+	
+	
+}
-- 
cgit v1.2.3


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.

---
 .../dynamicFrame/api/SimpleDynamicFrame.java       | 109 ++++++++++++---------
 1 file changed, 64 insertions(+), 45 deletions(-)

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

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 4c5c879..ec52758 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -12,6 +12,7 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Date;
 
+import org.uic.barcode.asn1.uper.AsnUtils;
 import org.uic.barcode.dynamicContent.api.DynamicContentCoder;
 import org.uic.barcode.dynamicContent.api.IUicDynamicContent;
 import org.uic.barcode.dynamicContent.fdc1.UicDynamicContentDataFDC1;
@@ -143,6 +144,22 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		return null;
 	}
 	
+	private byte[] getEncoded(String path, byte[] data) throws EncodingFormatException {
+		
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV1.getEncoded(path, data);
+			
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV2.getEncoded(path, data);
+			
+		}
+		
+		return null;
+	}
+	
+	
 	private byte[] encode(ILevel2Data level2SignedData2) throws EncodingFormatException {
 		
 		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
@@ -213,9 +230,9 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @return the int
 	 * @throws EncodingFormatException 
 	 */	
-	public int validateLevel2() throws EncodingFormatException {
+	public int validateLevel2(byte[] data) throws EncodingFormatException {
 
-		return validateLevel2(null);
+		return validateLevel2(null, data);
 	
 	}
 	
@@ -224,11 +241,11 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * 
 	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
 	 *
-	 * @param prov the prov
-	 * @return the int
+	 * @param prov the registered security provider
+	 * @return the return error code
 	 * @throws EncodingFormatException 
 	 */	
-	public int validateLevel2(Provider prov) throws EncodingFormatException {
+	public int validateLevel2(Provider prov, byte[] data) throws EncodingFormatException {
 		
 		
 		String level2KeyAlg = this.getLevel2Data().getLevel1Data().getLevel2KeyAlg();
@@ -244,7 +261,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 					
 		String keyAlgName = null;
 		try {
-			keyAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_KEY_GENERATOR_ALG, level2KeyAlg);
+			keyAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_KEY_GENERATOR_ALG, level2KeyAlg,prov);
 		} catch (Exception e1) {
 			return Constants.LEVEL2_VALIDATION_KEY_ALG_NOT_IMPLEMENTED;	
 		}
@@ -268,7 +285,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 
 		String sigAlgName = null;
 		try {
-			sigAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_SIGNATURE_ALG,level2SigAlg);
+			sigAlgName = AlgorithmNameResolver.getName(AlgorithmNameResolver.TYPE_SIGNATURE_ALG,level2SigAlg,prov);
 		} catch (Exception e1) {
 			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}
@@ -293,8 +310,14 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		}
 		
 		try {
-			byte[] data = encode(level2Data);
-			sig.update(data);
+			//TODO
+			//byte[] signedData = encode(level2Data);
+			//String s1 = AsnUtils.toBooleanString(signedData);
+			
+			byte[] signedData2 = getEncoded("Level2Data", data);
+			//String s2 = AsnUtils.toBooleanString(signedData);
+			
+			sig.update(signedData2);
 		} catch (SignatureException e) {
 			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		} catch (IllegalArgumentException e) {
@@ -325,7 +348,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @return the int
 	 * @throws EncodingFormatException 
 	 */
-	public int validateLevel1(PublicKey key, Provider prov) throws EncodingFormatException {
+	public int validateLevel1(PublicKey key, Provider prov, byte[] data) throws EncodingFormatException {
 		
 		if (level2Data == null) {
 			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
@@ -342,7 +365,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		//find the algorithm name for the signature OID
 		String algo = null;
 		try {
-			algo = AlgorithmNameResolver.getSignatureAlgorithmName(getLevel2Data().getLevel1Data().getLevel1SigningAlg());
+			algo = AlgorithmNameResolver.getSignatureAlgorithmName(getLevel2Data().getLevel1Data().getLevel1SigningAlg(), prov);
 		} catch (Exception e1) {
 			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}	
@@ -368,7 +391,15 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		}
 		
 		try {
-			sig.update(encode(level2Data.getLevel1Data()));
+			
+			//byte[] encodedData = encode(level2Data.getLevel1Data());
+			//String s1 = AsnUtils.toBooleanString(encodedData);
+			//TODO
+			byte[]  encodedData2 = getEncoded("Level1Data", data);
+			//String s2 = AsnUtils.toBooleanString(encodedData2);
+			
+			sig.update(encodedData2);	
+			
 		} catch (SignatureException e) {
 			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		} catch (IllegalArgumentException e) {
@@ -402,9 +433,9 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @return the int
 	 * @throws EncodingFormatException 
 	 */
-	public int validateLevel1(PublicKey key) throws EncodingFormatException {
+	public int validateLevel1(PublicKey key, byte[] data) throws EncodingFormatException {
 		
-		return validateLevel1(key, null);
+		return validateLevel1(key, null,data);
 
   	}
 	
@@ -416,13 +447,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 */
 	public void signLevel2(PrivateKey key) throws Exception {
 		
-		//find the algorithm name for the signature OID
-		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(level2Data.getLevel1Data().getLevel2SigningAlg());
-		Signature sig = Signature.getInstance(algo);
-		sig.initSign(key);
-		byte[] data = encode(level2Data);
-		sig.update(data);
-		level2Signature = sig.sign();
+		signLevel2(key, null);
 		
 	}
 
@@ -430,17 +455,22 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * Sign level 2 data.
 	 *
 	 * @param key the key
-	 * @param prov the security Provider
+	 * @param prov the registered 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.getLevel2Data().getLevel1Data().getLevel2SigningAlg());
-		Signature sig = Signature.getInstance(algo,prov);
+		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(this.getLevel2Data().getLevel1Data().getLevel2SigningAlg(), prov);
+		Signature sig = null;
+		if (prov != null) {
+			sig = Signature.getInstance(algo,prov);
+		} else {
+			sig = Signature.getInstance(algo);
+		}
 		sig.initSign(key);
-		byte[] data = encode(level2Data);
-		sig.update(data);
+		byte[] signedData = encode(level2Data);
+		sig.update(signedData);
 		level2Signature = sig.sign();
 		
 	}
@@ -453,8 +483,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @throws EncodingFormatException the encoding format exception
 	 */
 	public void addDynamicContent(IUicDynamicContent content) throws EncodingFormatException {
-		
-		
+				
 		level2Data.setLevel2Data(new SimpleData());
 		
 		level2Data.getLevel2Data().setFormat(DynamicContentCoder.dynamicContentDataFDC1);
@@ -501,19 +530,8 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 */
 	public void signLevel1(PrivateKey key) throws Exception {
 		
-		if (level2Data == null) return;
-		
-		ILevel1Data level1Data = level2Data.getLevel1Data();
-		
-		if (level1Data == null) return;
+		signLevel1(key, null);
 		
-		//find the algorithm name for the signature OID
-		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(level1Data.getLevel1SigningAlg());
-		Signature sig = Signature.getInstance(algo);
-		sig.initSign(key);
-		byte[] data = encode(level1Data);
-		sig.update(data);
-		level2Data.setLevel1Signature(sig.sign());
 	}
 
 	/**
@@ -538,16 +556,17 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		
 		//find the algorithm name for the signature OID
 		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(level1Data.getLevel1SigningAlg());
-		Signature sig = Signature.getInstance(algo, prov);
+		Signature sig = null;
+		if (prov != null) {
+			sig = Signature.getInstance(algo, prov);
+		} else {
+			sig = Signature.getInstance(algo);
+		}
 		sig.initSign(key);
 				
 		byte[] data = encode(level1Data);
 		sig.update(data);
 		level2Data.setLevel1Signature(sig.sign());	
 	}
-
-
-
-	
 	
 }
-- 
cgit v1.2.3


From 7af6c4ca50322258bbd23214920c4c9122482966 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 25 Jan 2022 13:33:37 +0100
Subject: test for the new dynamic header version 2

---
 .../dynamicFrame/api/SimpleDynamicFrame.java       | 68 ++++++++++++++--------
 1 file changed, 44 insertions(+), 24 deletions(-)

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

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 ec52758..65b81d6 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -120,7 +120,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			
 			return DynamicFrameCoderV1.encode(this);
 			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
 			
 			return DynamicFrameCoderV2.encode(this);
 			
@@ -135,13 +135,12 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			
 			return DynamicFrameCoderV1.encode(level1Data);
 			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
 			
 			return DynamicFrameCoderV2.encode(level1Data);
 			
 		}
-		
-		return null;
+		throw new EncodingFormatException("Dynamic Header Version not supported: " + format);
 	}
 	
 	private byte[] getEncoded(String path, byte[] data) throws EncodingFormatException {
@@ -150,29 +149,29 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			
 			return DynamicFrameCoderV1.getEncoded(path, data);
 			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
 			
 			return DynamicFrameCoderV2.getEncoded(path, data);
 			
 		}
 		
-		return null;
+		throw new EncodingFormatException("Dynamic Header Version not supported: " + format);
 	}
 	
 	
-	private byte[] encode(ILevel2Data level2SignedData2) throws EncodingFormatException {
+	private byte[] encode(ILevel2Data level2Data) throws EncodingFormatException {
 		
 		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
 			
-			return DynamicFrameCoderV1.encode(level2SignedData2);
+			return DynamicFrameCoderV1.encode(level2Data);
 			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
 			
-			return DynamicFrameCoderV2.encode(level2SignedData2);
+			return DynamicFrameCoderV2.encode(level2Data);
 			
 		}
 		
-		return null;
+		throw new EncodingFormatException("Dynamic Header Version not supported: " + format);
 	}
 	
 	/**
@@ -182,22 +181,24 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @param bytes the bytes
 	 * @return the dynamic header
+	 * @throws EncodingFormatException 
 	 */
-	public void decode(byte[] bytes) {
+	public void decode(byte[] bytes) throws EncodingFormatException {
 		
 		String format = getFormat(bytes);
 			
 		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
 			
 			DynamicFrameCoderV1.decode(this,bytes);
+			return;
 			
 		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
 		
 			DynamicFrameCoderV2.decode(this,bytes);
-			
+			return;
 		}
 		
-		
+		throw new EncodingFormatException("Dynamic Header Version not supported");
 
 	}
 	
@@ -211,12 +212,35 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @return true, if is static header
 	 */
 	private static String getFormat(byte[] data) {
-		byte[] start = "U1".getBytes();
-		if (start[0] != data[0] || start[1]!= start[1]) {
+		
+		if (data == null || data.length < 4) return null;
+		
+		byte[] startBits = new byte[4];
+		startBits[0] = data[0];
+		startBits[1] = data[1];
+		startBits[2] = data[2];
+		startBits[3] = data[3];
+
+		String start = AsnUtils.toBooleanString(startBits);
+		
+		/*
+		 * bitshift: 
+		 * 
+		 * version 1:
+		 *    optional Level2Data 1 bit
+		 *    length of format:   8 bit
+		 * 
+		 * version 2:
+		 *    extensionIndicator  1 bit
+		 *    optional Level2Data 1 bit
+		 *    length of format:   8 bit
+		 */
+		
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1_BIN.equals(start.substring(9, 23))) {
 			return Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1;
 		}
-		start = "U2".getBytes();
-		if (start[0] != data[0] || start[1]!= start[1]) {
+		
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2_BIN.equals(start.substring(10, 24))) {
 			return Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2;
 		}
 		return null;
@@ -392,13 +416,9 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		
 		try {
 			
-			//byte[] encodedData = encode(level2Data.getLevel1Data());
-			//String s1 = AsnUtils.toBooleanString(encodedData);
-			//TODO
-			byte[]  encodedData2 = getEncoded("Level1Data", data);
-			//String s2 = AsnUtils.toBooleanString(encodedData2);
+			byte[]  encodedData = getEncoded("Level1Data", data);
 			
-			sig.update(encodedData2);	
+			sig.update(encodedData);	
 			
 		} catch (SignatureException e) {
 			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
-- 
cgit v1.2.3


From 7410ac59ba8e1994254a872104ea660b992cba9a Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Fri, 28 Jan 2022 17:06:47 +0100
Subject: new dynamic header version

---
 .../dynamicFrame/api/SimpleDynamicFrame.java       | 183 ++++++---------------
 1 file changed, 48 insertions(+), 135 deletions(-)

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

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 65b81d6..8d53f9a 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -12,7 +12,7 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Date;
 
-import org.uic.barcode.asn1.uper.AsnUtils;
+import org.uic.barcode.asn1.uper.UperEncoder;
 import org.uic.barcode.dynamicContent.api.DynamicContentCoder;
 import org.uic.barcode.dynamicContent.api.IUicDynamicContent;
 import org.uic.barcode.dynamicContent.fdc1.UicDynamicContentDataFDC1;
@@ -40,7 +40,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	}
 
 	/** The format. */
-	public String format = Constants.DYNAMIC_BARCODE_FORMAT_DEFAULT;
+	public String format = null;
 	
 	/** The level 2 signed data. */
 	/*level 2 data*/
@@ -115,136 +115,15 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @throws EncodingFormatException 
 	 */
 	public byte[] encode() throws EncodingFormatException {
-			
-		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
-			
-			return DynamicFrameCoderV1.encode(this);
-			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
-			
-			return DynamicFrameCoderV2.encode(this);
-			
-		}
-		
-		return null;
-	}
-	
-	private byte[] encode(ILevel1Data level1Data) throws EncodingFormatException {
-		
-		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
-			
-			return DynamicFrameCoderV1.encode(level1Data);
-			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
-			
-			return DynamicFrameCoderV2.encode(level1Data);
-			
-		}
-		throw new EncodingFormatException("Dynamic Header Version not supported: " + format);
-	}
-	
-	private byte[] getEncoded(String path, byte[] data) throws EncodingFormatException {
-		
-		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
-			
-			return DynamicFrameCoderV1.getEncoded(path, data);
-			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
-			
-			return DynamicFrameCoderV2.getEncoded(path, data);
-			
-		}
 		
-		throw new EncodingFormatException("Dynamic Header Version not supported: " + format);
-	}
-	
-	
-	private byte[] encode(ILevel2Data level2Data) throws EncodingFormatException {
-		
-		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
-			
-			return DynamicFrameCoderV1.encode(level2Data);
-			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
-			
-			return DynamicFrameCoderV2.encode(level2Data);
-			
-		}
-		
-		throw new EncodingFormatException("Dynamic Header Version not supported: " + format);
-	}
-	
-	/**
-	 * Decode.
-	 *
-	 * Decode the header from an ASN.1 PER UNALIGNED encoded byte array
-	 *
-	 * @param bytes the bytes
-	 * @return the dynamic header
-	 * @throws EncodingFormatException 
-	 */
-	public void decode(byte[] bytes) throws EncodingFormatException {
-		
-		String format = getFormat(bytes);
-			
-		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
-			
-			DynamicFrameCoderV1.decode(this,bytes);
-			return;
+		return DynamicFrameCoder.encode(this);
 			
-		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
-		
-			DynamicFrameCoderV2.decode(this,bytes);
-			return;
-		}
-		
-		throw new EncodingFormatException("Dynamic Header Version not supported");
 
+		
 	}
 	
 
-
 	
-	/**
-	 * Checks if is static header.
-	 *
-	 * @param data the data
-	 * @return true, if is static header
-	 */
-	private static String getFormat(byte[] data) {
-		
-		if (data == null || data.length < 4) return null;
-		
-		byte[] startBits = new byte[4];
-		startBits[0] = data[0];
-		startBits[1] = data[1];
-		startBits[2] = data[2];
-		startBits[3] = data[3];
-
-		String start = AsnUtils.toBooleanString(startBits);
-		
-		/*
-		 * bitshift: 
-		 * 
-		 * version 1:
-		 *    optional Level2Data 1 bit
-		 *    length of format:   8 bit
-		 * 
-		 * version 2:
-		 *    extensionIndicator  1 bit
-		 *    optional Level2Data 1 bit
-		 *    length of format:   8 bit
-		 */
-		
-		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1_BIN.equals(start.substring(9, 23))) {
-			return Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1;
-		}
-		
-		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2_BIN.equals(start.substring(10, 24))) {
-			return Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2;
-		}
-		return null;
-	}
 	
 	/**
 	 * Verify the level 2 signature
@@ -334,13 +213,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		}
 		
 		try {
-			//TODO
-			//byte[] signedData = encode(level2Data);
-			//String s1 = AsnUtils.toBooleanString(signedData);
-			
-			byte[] signedData2 = getEncoded("Level2Data", data);
-			//String s2 = AsnUtils.toBooleanString(signedData);
-			
+			byte[] signedData2 = getLevel2DataBin();
 			sig.update(signedData2);
 		} catch (SignatureException e) {
 			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
@@ -416,7 +289,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		
 		try {
 			
-			byte[]  encodedData = getEncoded("Level1Data", data);
+			byte[]  encodedData = getLevel1DataBin();			
 			
 			sig.update(encodedData);	
 			
@@ -489,7 +362,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			sig = Signature.getInstance(algo);
 		}
 		sig.initSign(key);
-		byte[] signedData = encode(level2Data);
+		byte[] signedData = DynamicFrameCoder.encodeLevel2Data(this);
 		sig.update(signedData);
 		level2Signature = sig.sign();
 		
@@ -584,9 +457,49 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		}
 		sig.initSign(key);
 				
-		byte[] data = encode(level1Data);
+		byte[] data = DynamicFrameCoder.encodeLevel1(this);
 		sig.update(data);
 		level2Data.setLevel1Signature(sig.sign());	
 	}
+
+	@Override
+	public byte[] getLevel1Signature() {
+		return getLevel2Data().getLevel1Signature();
+	}
+
+	@Override
+	public byte[] getLevel1DataBin() throws EncodingFormatException {
+		
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV1.encode(getLevel2Data().getLevel1Data());
+			
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
+			
+			return DynamicFrameCoderV2.encode(getLevel2Data().getLevel1Data());
+			
+		}
+		
+		throw new EncodingFormatException("Dynamic Header Version not supported");
+
+	}
+	
+	
+	public byte[] getLevel2DataBin() throws EncodingFormatException {
+		
+		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
+			
+			return DynamicFrameCoderV1.encodeLevel2Data(getLevel2Data());
+			
+		} else if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_2.equals(format)) {
+			
+			return DynamicFrameCoderV2.encodeLevel2Data(getLevel2Data());
+			
+		}
+		
+		throw new EncodingFormatException("Dynamic Header Version not supported");
+
+	}
+
 	
 }
-- 
cgit v1.2.3


From 2f72a6419dd1e20acf6e77a9276a6055892e732a Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:45:04 +0100
Subject: - missing fieldOrder added - validation of level1 when the signature
 algorithm is missing

---
 .../dynamicFrame/api/SimpleDynamicFrame.java       | 144 ++++++++++-----------
 1 file changed, 69 insertions(+), 75 deletions(-)

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

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 8d53f9a..a05a936 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/api/SimpleDynamicFrame.java
@@ -12,7 +12,6 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Date;
 
-import org.uic.barcode.asn1.uper.UperEncoder;
 import org.uic.barcode.dynamicContent.api.DynamicContentCoder;
 import org.uic.barcode.dynamicContent.api.IUicDynamicContent;
 import org.uic.barcode.dynamicContent.fdc1.UicDynamicContentDataFDC1;
@@ -57,6 +56,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @return the format
 	 */
+	@Override
 	public String getFormat() {
 		return format;
 	}
@@ -66,6 +66,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @param format the new format
 	 */
+	@Override
 	public void setFormat(String format) {
 		this.format = format;
 	}
@@ -75,6 +76,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @return the level 2 signed data
 	 */
+	@Override
 	public ILevel2Data getLevel2Data() {
 		return level2Data;
 	}
@@ -84,6 +86,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @param level2SignedData the new level 2 signed data
 	 */
+	@Override
 	public void setLevel2Data(ILevel2Data level2SignedData) {
 		this.level2Data = level2SignedData;
 	}
@@ -93,6 +96,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @return the level 2 signature
 	 */
+	@Override
 	public byte[] getLevel2Signature() {
 		return level2Signature;
 	}
@@ -102,29 +106,13 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @param level2Signature the new level 2 signature
 	 */
+	@Override
 	public void setLevel2Signature(byte[] level2Signature) {
 		this.level2Signature = level2Signature;
 	}
 
-	/**
-	 * Encode.
-	 * 
-	 * Encode the header as ASN.1 PER UNALIGNED byte array
-	 *
-	 * @return the byte[]
-	 * @throws EncodingFormatException 
-	 */
-	public byte[] encode() throws EncodingFormatException {
-		
-		return DynamicFrameCoder.encode(this);
-			
-
-		
-	}
-	
 
 	
-	
 	/**
 	 * Verify the level 2 signature
 	 * 
@@ -133,9 +121,9 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @return the int
 	 * @throws EncodingFormatException 
 	 */	
-	public int validateLevel2(byte[] data) throws EncodingFormatException {
-
-		return validateLevel2(null, data);
+	@Override
+	public int validateLevel2() throws EncodingFormatException {
+		return validateLevel2(null);
 	
 	}
 	
@@ -148,10 +136,17 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @return the return error code
 	 * @throws EncodingFormatException 
 	 */	
-	public int validateLevel2(Provider prov, byte[] data) throws EncodingFormatException {
+	@Override
+	public int validateLevel2(Provider prov) throws EncodingFormatException {
 		
+		if (getLevel2Data() == null
+				|| getLevel2Data().getLevel1Data() == null 
+				|| getLevel2Data().getLevel1Data().getLevel2KeyAlg() == null
+				|| getLevel2Data().getLevel1Data().getLevel2KeyAlg().length() == 0) {
+			return Constants.LEVEL2_VALIDATION_NO_KEY;
+		}
 		
-		String level2KeyAlg = this.getLevel2Data().getLevel1Data().getLevel2KeyAlg();
+		String level2KeyAlg = getLevel2Data().getLevel1Data().getLevel2KeyAlg();
 
 	 
 		if (level2KeyAlg == null || level2KeyAlg.length() == 0) {
@@ -235,34 +230,53 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 		}
   	}
 	
-	/**
-	 * Verify the level 1 signature
-	 * 
-	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
-	 *
-	 * @param key the key
-	 * @param prov the prov
-	 * @return the int
-	 * @throws EncodingFormatException 
-	 */
-	public int validateLevel1(PublicKey key, Provider prov, byte[] data) throws EncodingFormatException {
-		
-		if (level2Data == null) {
-			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
-		}
-		
+	@Override
+	public int validateLevel1(PublicKey key, Provider prov) throws EncodingFormatException {
+		return validateLevel1(key, prov, null);
+
+  	}
 	
-		if (level2Data == null || 
-			level2Data.getLevel1Signature().length == 0) {
+	@Override
+	public int validateLevel1(PublicKey key) throws EncodingFormatException {
+		return validateLevel1(key, null, null);
+  	}
+	
+	@Override
+	public int validateLevel1(PublicKey key, String signatureAlgorithmOid) throws EncodingFormatException {
+		return validateLevel1(key, null, signatureAlgorithmOid);
+	}
+
+	@Override
+	public int validateLevel1(PublicKey key, Provider prov, String signatureAlgorithmOid) throws EncodingFormatException {
+
+		if (getLevel2Data() == null
+				|| getLevel2Data().getLevel1Signature() == null
+				|| getLevel2Data().getLevel1Signature() == null
+				|| getLevel2Data().getLevel1Signature().length == 0) {
 			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
 		}
 		
 		byte[] signature = this.getLevel2Data().getLevel1Signature();
+
+	
+		//find the algorithm name for the signature OID		
+		String signingAlgorithmOid = null;
+		if (getLevel2Data() != null 
+				&& getLevel2Data().getLevel1Data() != null 
+				&& getLevel2Data().getLevel1Data().getLevel1SigningAlg() != null
+				&& getLevel2Data().getLevel1Data().getLevel1SigningAlg().length() > 0) {
+				signingAlgorithmOid = getLevel2Data().getLevel1Data().getLevel1SigningAlg();	
+		} else {
+			signingAlgorithmOid = signatureAlgorithmOid;
+		}
 				
+		if (signingAlgorithmOid == null || signingAlgorithmOid.length() == 0) {
+			return Constants.LEVEL1_VALIDATION_NO_SIGNATURE;
+		}				
 		//find the algorithm name for the signature OID
 		String algo = null;
 		try {
-			algo = AlgorithmNameResolver.getSignatureAlgorithmName(getLevel2Data().getLevel1Data().getLevel1SigningAlg(), prov);
+			algo = AlgorithmNameResolver.getSignatureAlgorithmName(signingAlgorithmOid, prov);
 		} catch (Exception e1) {
 			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}	
@@ -301,47 +315,20 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 			return Constants.LEVEL1_VALIDATION_ENCODING_ERROR;
 		}
 		
-
 		try {
 			if (sig.verify(signature)){
-				return Constants.LEVEL2_VALIDATION_OK;
+				return Constants.LEVEL1_VALIDATION_OK;
 			} else {
-				return Constants.LEVEL2_VALIDATION_FRAUD;
+				return Constants.LEVEL1_VALIDATION_FRAUD;
 			}
 		} catch (SignatureException e) {
-			return Constants.LEVEL2_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
+			return Constants.LEVEL1_VALIDATION_SIG_ALG_NOT_IMPLEMENTED;
 		}
-  	}
-	
-
-
-
-
-	/**
-	 * Verify the level 1 signature
-	 * 
-	 * Note:  an appropriate security provider (e.g. BC) must be registered before 
-	 *
-	 * @param key the key
-	 * @return the int
-	 * @throws EncodingFormatException 
-	 */
-	public int validateLevel1(PublicKey key, byte[] data) throws EncodingFormatException {
-		
-		return validateLevel1(key, null,data);
-
-  	}
+	}
 	
-	/**
-	 * Sign level 2 data without a specific security provider.
-	 *
-	 * @param key the key
-	 * @throws Exception the exception
-	 */
+	@Override
 	public void signLevel2(PrivateKey key) throws Exception {
-		
 		signLevel2(key, null);
-		
 	}
 
 	/**
@@ -351,6 +338,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @param prov the registered security provider
 	 * @throws Exception the exception
 	 */
+	@Override
 	public void signLevel2(PrivateKey key, Provider prov) throws Exception {
 		
 		//find the algorithm name for the signature OID
@@ -375,6 +363,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @param content the dynamic content
 	 * @throws EncodingFormatException the encoding format exception
 	 */
+	@Override
 	public void addDynamicContent(IUicDynamicContent content) throws EncodingFormatException {
 				
 		level2Data.setLevel2Data(new SimpleData());
@@ -390,6 +379,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @param dynamicData the dynamic data
 	 */
+	@Override
 	public void addLevel2DynamicData(UicDynamicContentDataFDC1 dynamicData) {
 		this.getLevel2Data().setLevel2Data(dynamicData.getApiDataType());	
 	}
@@ -399,6 +389,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 *
 	 * @return the dynamic content
 	 */
+	@Override
 	public IUicDynamicContent getDynamicContent() {
 		
 		if (this.getLevel2Data() == null || 
@@ -421,6 +412,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 	 * @return the byte[]
 	 * @throws Exception 
 	 */
+	@Override
 	public void signLevel1(PrivateKey key) throws Exception {
 		
 		signLevel1(key, null);
@@ -484,7 +476,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 
 	}
 	
-	
+	@Override
 	public byte[] getLevel2DataBin() throws EncodingFormatException {
 		
 		if (Constants.DYNAMIC_BARCODE_FORMAT_VERSION_1.equals(format)) {
@@ -501,5 +493,7 @@ public class SimpleDynamicFrame implements IDynamicFrame {
 
 	}
 
+
+
 	
 }
-- 
cgit v1.2.3