Mobile BKU first working (currently set to work with test mobile BKU from A-Trust

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@31 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

3 files changed, 57 insertions, 1 deletions

diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/BKUs.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/BKUs.java
new file mode 100644
index 00000000..95b2f280
--- /dev/null
+++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/BKUs.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2012 by A-SIT, Secure Information Technology Center Austria
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://joinup.ec.europa.eu/software/page/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ */
+package at.asit.pdfover.signator;
+
+// Imports
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Enumeration of available BKU types
+ */
+public enum BKUs {
+	/**
+	 * Local bku
+	 */
+	LOCAL,
+	
+	/**
+	 * Mobile bku
+	 */
+	MOBILE,
+	
+	/**
+	 * None bku
+	 */
+	NONE
+}
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLRequest.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLRequest.java
index e3a372c5..f4e1fa8e 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLRequest.java
+++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLRequest.java
@@ -55,7 +55,7 @@ public class SLRequest {
 	 * @return SL request String
 	 */
 	public String getBase64Request() {
-		byte[] b64content = Base64.encodeBase64(getSignatureData().getByteArray());
+		String b64content = new String(Base64.encodeBase64(getSignatureData().getByteArray()));
 
 		String b64request = this.request.replace(
 						DATAOBJECT_STRING,
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java
index f3ba2a34..a89f9784 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java
+++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java
@@ -48,6 +48,22 @@ public abstract class SignatureParameter {
 	 */
 	protected Emblem emblem;
 
+	protected BKUs signatureDevice;
+	
+	/**
+	 * @return the signatureDevice
+	 */
+	public BKUs getSignatureDevice() {
+		return this.signatureDevice;
+	}
+
+	/**
+	 * @param signatureDevice the signatureDevice to set
+	 */
+	public void setSignatureDevice(BKUs signatureDevice) {
+		this.signatureDevice = signatureDevice;
+	}
+
 	/** 
 	 * Getter of the property <tt>signaturePosition</tt>
 	 * @return  Returns the signaturePosition.