1 files changed, 20 insertions, 0 deletions
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
index 908ed57..5aff091 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
@@ -458,6 +458,13 @@ public final class BKUHelper
     Matcher cert_qualified_m = cert_qualified_p.matcher(xmlResponse);
     // [tknall] stop qualified certificate
 
+    String secureSignatureCreationDevice_certificate = "<SecureSignatureCreationDevice Source=\"Certificate\"/>";//TODO use XPATH
+    String secureSignatureCreationDevice_tsl = "<SecureSignatureCreationDevice Source=\"TSL\"/>";//TODO use XPATH
+    Pattern issuerCountryCode_p_s = Pattern.compile("<IssuerCountryCode>");
+    Pattern issuerCountryCode_p_e = Pattern.compile("</IssuerCountryCode>");
+    Matcher issuerCountryCode_m_s = issuerCountryCode_p_s.matcher(xmlResponse);
+    Matcher issuerCountryCode_m_e = issuerCountryCode_p_e.matcher(xmlResponse);       
+
     Pattern code_p_s = Pattern.compile("<[\\w]*:?Code>"); //$NON-NLS-1$
     Pattern code_p_e = Pattern.compile("</[\\w]*:?Code>"); //$NON-NLS-1$
     Pattern info_p_s = Pattern.compile("<[\\w]*:?Info>"); //$NON-NLS-1$
@@ -517,6 +524,19 @@ public final class BKUHelper
     sig_res.setQualifiedCertificate(cert_qualified_m.find());
     // [tknall] stop qualified certificate
 
+
+    sig_res.setSecureSignatureCreationDevice(null);//TODO use XPATH
+    if(xmlResponse.contains(secureSignatureCreationDevice_tsl))
+    	sig_res.setSecureSignatureCreationDevice("TSL");
+    if(xmlResponse.contains(secureSignatureCreationDevice_certificate))
+    	sig_res.setSecureSignatureCreationDevice("Certificate");
+     
+    try{
+    	String issuerCountry = xmlResponse.substring(issuerCountryCode_m_s.end(), issuerCountryCode_m_e.start());
+    	sig_res.setIssuerCountryCode(issuerCountry);
+    }catch(Exception e){log.debug("IssuerCountryCode not found in MOA response");}
+    
+    
     if (hash_data_m_s.find() && hash_data_m_e.find())
     {
       String hashInputData = xmlResponse.substring(hash_data_m_s.end(), hash_data_m_e.start());