From c830c865409321401504ac1ca296ced194811a16 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 12 Apr 2022 14:12:55 +0200
Subject: test on car carriage cleanup

---
 .../uic/barcode/dynamicFrame/v2/DynamicFrame.java  | 52 ----------------------
 .../barcode/dynamicFrame/v2/Level2DataType.java    | 44 ------------------
 2 files changed, 96 deletions(-)

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

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
index 30043c0..cb5c37a 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
@@ -1,8 +1,5 @@
 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.CharacterRestriction;
 import org.uic.barcode.asn1.datatypes.FieldOrder;
@@ -14,7 +11,6 @@ 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.ticket.EncodingFormatException;
-import org.uic.barcode.utils.AlgorithmNameResolver;
 
 
 /**
@@ -122,53 +118,5 @@ public class DynamicFrame extends Object{
 		return UperEncoder.decode(bytes, DynamicFrame.class);	
 	}
 	
-	
 
-	
-	/**
-	 * 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 {
-		
-		
-		this.getLevel2SignedData().setLevel2Data(new DataType());
-		
-		this.getLevel2SignedData().getLevel2Data().setFormat(DynamicContentCoder.dynamicContentDataFDC1);
-			
-		this.getLevel2SignedData().getLevel2Data().setByteData(DynamicContentCoder.encode(content, DynamicContentCoder.dynamicContentDataFDC1));
-		
-	}
-	
-	/**
-	 * Adds the level 2 dynamic data. (ASN level)
-	 *
-	 * @param dynamicData the dynamic data
-	 */
-	public void addLevel2DynamicData(UicDynamicContentDataFDC1 dynamicData) {
-		DataType dt = new DataType();
-		dt.setByteData(dynamicData.getDataType().getByteData());
-		dt.setFormat(dynamicData.getDataType().getFormat());	
-		level2SignedData.setLevel2Data(dt);	
-	}
-	
-	/**
-	 * Gets the dynamic content.
-	 *
-	 * @return the dynamic content
-	 */
-	public IUicDynamicContent getDynamicContent() {
-		
-		if (this.getLevel2SignedData() == null || 
-				this.getLevel2SignedData().getLevel2Data() == null){
-				return null;
-		}
-		
-		return DynamicContentCoder.decode(this.getLevel2SignedData().getLevel2Data().getByteData());
-			
-	}
-	
-	
 }
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 cd0800e..262fa2f 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
@@ -1,15 +1,10 @@
 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.Sequence;
 import org.uic.barcode.asn1.datatypesimpl.OctetString;
 import org.uic.barcode.asn1.uper.UperEncoder;
-import org.uic.barcode.utils.AlgorithmNameResolver;
 
 /**
  * The Class DataType.
@@ -76,46 +71,7 @@ public class Level2DataType {
 		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