package backend;

import java.security.interfaces.RSAPrivateKey;

/**
 * Wrapper class for the initial data that is to be sent to the
 * smartcard/terminal upon initialization.
 * 
 * TODO/WARNING: values can be null in current implementation
 */
public class InitData {
	
	public byte[] certificate;
	public byte[] privateKey;
	public byte[] secretKey;
	public byte[] caVerifKey;

	public InitData(byte[] certificate, RSAPrivateKey privateKey) {
		this(certificate, privateKey, null, null);
	}
	
	public InitData(byte[] certificate, RSAPrivateKey privateKey, byte[] caVerifKey) {
		this(certificate, privateKey, null, caVerifKey);
	}

	public InitData(byte[] certificate, RSAPrivateKey privateKey, byte[] secretKey,
			byte[] caVerifKey) {
		this.certificate = certificate;
		this.privateKey = privateKey;
		this.secretKey = secretKey;
		this.caVerifKey = caVerifKey;
	}
}

@@ -302,22 +302,29 @@
 %09public 
-byte%5B%5D
+RSAPrivateKey
  private
@@ -445,33 +445,33 @@
 ateKey) %7B%0A%09%09this
-(
+.
 certificate, pri
@@ -469,177 +469,60 @@
 cate
-, privateKey, null, null);%0A%09%7D%0A%09%0A%09public InitData(byte%5B%5D certificate, RSAPrivateKey privateKey, byte%5B%5D caVerifKey) %7B%0A%09%09this(certificate, privateKey, null, caVerif
+ = certificate;%0A%09%09this.privateKey = private
 Key
-)
 ;%0A%09%7D
+%0A%09
 %0A%0A%09p
@@ -592,29 +592,8 @@
 te%5B%5D
- secretKey,%0A%09%09%09byte%5B%5D
  caV
@@ -673,38 +673,8 @@
 ey;%0A
-%09%09this.secretKey = secretKey;%0A
 %09%09th

Change data type of terminal data