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

---
 .../barcode/dynamicFrame/v2/Level2DataType.java    | 123 +++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java

(limited to 'src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java')

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
new file mode 100644
index 0000000..6534c4d
--- /dev/null
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
@@ -0,0 +1,123 @@
+package org.uic.barcode.dynamicFrame.v2;
+
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Signature;
+
+import org.uic.barcode.asn1.datatypes.Asn1Optional;
+import org.uic.barcode.asn1.datatypes.FieldOrder;
+import org.uic.barcode.asn1.datatypes.HasExtensionMarker;
+import org.uic.barcode.asn1.datatypes.Sequence;
+import org.uic.barcode.asn1.datatypesimpl.OctetString;
+import org.uic.barcode.asn1.uper.UperEncoder;
+import org.uic.barcode.utils.AlgorithmNameResolver;
+
+/**
+ * The Class DataType.
+ */
+@Sequence
+@HasExtensionMarker
+public class Level2DataType {
+
+	@FieldOrder(order = 0)
+	Level1DataType level1Data;
+	
+	/** The data. */
+	@FieldOrder(order = 1)
+	@Asn1Optional public OctetString level1Signature;
+	
+	@FieldOrder(order = 2)
+	@Asn1Optional DataType level2Data;
+
+
+	public Level1DataType getLevel1Data() {
+		return level1Data;
+	}
+
+
+	public void setLevel1Data(Level1DataType level1Data) {
+		this.level1Data = level1Data;
+	}
+
+
+	public OctetString getLevel1Signature() {
+		return level1Signature;
+	}
+
+	public byte[] getLevel1SignatureBytes() {
+		return level1Signature.toByteArray();
+	}
+
+	public void setLevel1Signature(OctetString level1Signature) {
+		this.level1Signature = level1Signature;
+	}
+	
+	public void setLevel1Signature(byte[] level1Signature) {
+		this.level1Signature = new OctetString(level1Signature);
+	}
+
+
+	public DataType getLevel2Data() {
+		return level2Data;
+	}
+
+
+	public void setLevel2Data(DataType level2Data) {
+		this.level2Data = level2Data;
+	}
+
+	
+	/**
+	 * Encode.
+	 * 
+	 * Encode the header as ASN.1 PER UNALIGNED byte array
+	 *
+	 * @return the byte[]
+	 */
+	public byte[] encode() {
+		return UperEncoder.encode(this);
+	}
+	
+	/**
+	 * 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 {
+		//find the algorithm name for the signature OID
+		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(getLevel1Data().level1SigningAlg);
+		Signature sig = Signature.getInstance(algo);
+		sig.initSign(key);
+		byte[] data = level1Data.encode();
+		sig.update(data);
+		this.level1Signature = new OctetString(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 
+	 */
+	public void signLevel1(PrivateKey key, Provider prov) throws Exception {
+		//find the algorithm name for the signature OID
+		String algo = AlgorithmNameResolver.getSignatureAlgorithmName(getLevel1Data().level1SigningAlg);
+		Signature sig = Signature.getInstance(algo, prov);
+		sig.initSign(key);
+		byte[] data = level1Data.encode();
+		sig.update(data);
+		this.level1Signature = new OctetString(sig.sign());
+	}
+	
+	
+}
-- 
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

---
 src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java')

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
index 6534c4d..cd0800e 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
@@ -6,7 +6,6 @@ import java.security.Signature;
 
 import org.uic.barcode.asn1.datatypes.Asn1Optional;
 import org.uic.barcode.asn1.datatypes.FieldOrder;
-import org.uic.barcode.asn1.datatypes.HasExtensionMarker;
 import org.uic.barcode.asn1.datatypes.Sequence;
 import org.uic.barcode.asn1.datatypesimpl.OctetString;
 import org.uic.barcode.asn1.uper.UperEncoder;
@@ -16,7 +15,6 @@ import org.uic.barcode.utils.AlgorithmNameResolver;
  * The Class DataType.
  */
 @Sequence
-@HasExtensionMarker
 public class Level2DataType {
 
 	@FieldOrder(order = 0)
-- 
cgit v1.2.3