summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-11-18 17:00:06 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-11-18 17:00:06 +0000
commit42eee365f6b0a99050493796546a5dd98665e500 (patch)
treee9b480c2c6290ca1b3b5c31220c8fb86046a5ef4
parent1a1fb78535611f094af3313b8da55e9ea3c8184e (diff)
downloadmocca-42eee365f6b0a99050493796546a5dd98665e500.tar.gz
mocca-42eee365f6b0a99050493796546a5dd98665e500.tar.bz2
mocca-42eee365f6b0a99050493796546a5dd98665e500.zip
min_config_version now 1.3.4-SNAPSHOT to update all previous (buggy) 1.3.3 configs
Issue #MOCCA-760 - forced configuration dir update reinstalls old config files git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@839 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/LIEZertifikatCard.java18
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java7
2 files changed, 17 insertions, 8 deletions
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/LIEZertifikatCard.java b/smcc/src/main/java/at/gv/egiz/smcc/LIEZertifikatCard.java
index 70a35685..c4324773 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/LIEZertifikatCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/LIEZertifikatCard.java
@@ -115,14 +115,26 @@ public class LIEZertifikatCard extends AbstractSignatureCard implements Signatur
byte[] ef_qcert = null;
for (CIOCertificate cioCertificate : ef_cd.getCIOs()) {
String label = cioCertificate.getLabel();
- //"TEST LLV APO 2s Liechtenstein Post Qualified CA ID"
+ //"Name (qualified signature"
if (label != null && label.toLowerCase()
- .contains("liechtenstein post qualified ca id")) {
+ .contains("qualified signature")) {
ef_qcert = cioCertificate.getEfidOrPath();
+ log.debug("found certificate: {} (fid={})", label, ef_qcert);
}
}
-
+ if (ef_qcert == null) {
+ for (CIOCertificate cioCertificate : ef_cd.getCIOs()) {
+ String label = cioCertificate.getLabel();
+ //"TEST LLV APO 2s Liechtenstein Post Qualified CA ID"
+ if (label != null && label.toLowerCase()
+ .contains("liechtenstein post qualified ca id")) {
+ ef_qcert = cioCertificate.getEfidOrPath();
+ log.debug("found certificate: {} (fid={})", label, ef_qcert);
+ }
+ }
+ }
+
if (ef_qcert == null) {
throw new NotActivatedException();
}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java
index 8ce98fcc..e8f657f7 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- *
+ * TODO
* @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
*/
public class ReaderFactory {
@@ -40,11 +40,8 @@ public class ReaderFactory {
public void setConfiguration(SMCCConfiguration configuration) {
if (configuration != null) {
- log.debug("reader configuration: disablePinpad=" + configuration.isDisablePinpad());
+ log.info("reader configuration: disablePinpad=" + configuration.isDisablePinpad());
}
- //spring injects configuration into singleton ReaderFactory instance,
- //but we access the ReaderFactory statically (getReader)
- //(we rather should query the application context to obtain a reader factory)
ReaderFactory.configuration = configuration;
}