From d311d0f7b7ef9ed5bc383d6744b7d61239aafbc1 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 13 Dec 2013 01:26:39 +0000
Subject: Extend STAL to support CMS SignedAttributes

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1262 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/stal/service/translator/STALTranslator.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java')

diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java b/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java
index 26eeaf55..28d60ed6 100644
--- a/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java
+++ b/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java
@@ -41,6 +41,7 @@ import at.gv.egiz.stal.QuitRequest;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
+import at.gv.egiz.stal.SignRequest.SignedInfo;
 import at.gv.egiz.stal.SignResponse;
 import at.gv.egiz.stal.StatusRequest;
 import at.gv.egiz.stal.StatusResponse;
@@ -218,7 +219,11 @@ public class STALTranslator {
       if (request instanceof SignRequest) {
         SignRequestType req = of.createSignRequestType();
         req.setKeyIdentifier(((SignRequest) request).getKeyIdentifier());
-        req.setSignedInfo(((SignRequest) request).getSignedInfo());
+        SignRequestType.SignedInfo signedInfo = of.createSignRequestTypeSignedInfo();
+        signedInfo.setValue(((SignRequest) request).getSignedInfo().getValue());
+        signedInfo.setIsCMSSignedAttributes(((SignRequest) request).getSignedInfo().isIsCMSSignedAttributes());
+        req.setSignedInfo(signedInfo);
+        req.setSignatureMethod(((SignRequest) request).getSignatureMethod());
         //TODO add hashdatainput (refactor signRequestType)
         return of.createGetNextRequestResponseTypeSignRequest(req);
       } else if (request instanceof InfoboxReadRequest) {
@@ -245,7 +250,11 @@ public class STALTranslator {
       } else if (request instanceof SignRequestType) {
         SignRequest stalReq = new SignRequest();
         stalReq.setKeyIdentifier(((SignRequestType) request).getKeyIdentifier());
-        stalReq.setSignedInfo(((SignRequestType) request).getSignedInfo());
+        SignedInfo signedInfo = new SignedInfo();
+        signedInfo.setValue(((SignRequestType) request).getSignedInfo().getValue());
+        signedInfo.setIsCMSSignedAttributes(((SignRequestType) request).getSignedInfo().isIsCMSSignedAttributes());
+        stalReq.setSignedInfo(signedInfo);
+        stalReq.setSignatureMethod(((SignRequestType) request).getSignatureMethod());
         return stalReq;
       } else if (request instanceof QuitRequestType) {
         return new QuitRequest();
-- 
cgit v1.2.3