summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Abraham <aabraham@iaik.tugraz.at>2018-02-06 12:14:09 (GMT)
committerAndreas Abraham <aabraham@iaik.tugraz.at>2018-02-06 12:14:09 (GMT)
commit29fe0718c7a78e8cee0c7689667064784db312c8 (patch)
tree164b5310f0e9e9754625bfc20ba8a52e4675e3cd
parente67b4208db678e2300635843c548ecc56a72e86a (diff)
downloadmocca-29fe0718c7a78e8cee0c7689667064784db312c8.zip
mocca-29fe0718c7a78e8cee0c7689667064784db312c8.tar.gz
mocca-29fe0718c7a78e8cee0c7689667064784db312c8.tar.bz2
bug fix in CERTIFICATES_KEYS, possible keys are now restricted
-rw-r--r--BKUWebStart/src/main/resources/log4j.properties7
-rw-r--r--bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java40
2 files changed, 28 insertions, 19 deletions
diff --git a/BKUWebStart/src/main/resources/log4j.properties b/BKUWebStart/src/main/resources/log4j.properties
index 8602244..f3a7ab4 100644
--- a/BKUWebStart/src/main/resources/log4j.properties
+++ b/BKUWebStart/src/main/resources/log4j.properties
@@ -30,4 +30,9 @@ log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
log4j.appender.file.datePattern='.'yyyy-MM-dd
log4j.appender.file.File=${user.home}/.mocca/logs/webstart.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c{2} - %m%n \ No newline at end of file
+log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c{2} - %m%n
+
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT.layout.ConversionPattern=%-5p | %d | %t | %c %x- %m%n
+
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java
index 4a7a15b..860d3db 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java
@@ -57,22 +57,27 @@ public class CertificatesInfoboxImpl extends AbstractAssocArrayInfobox {
*/
public static final String[] CERTIFICATES_KEYS = new String[] {
"SecureSignatureKeypair",
- "CertifiedKeypair",
- "00",
- "01",
- "02",
- "03",
- "04",
- "05",
- "06",
- "07",
- "08",
- "09",
- "10",
- "11",
- "12",
- "13",
- "14"};
+ "CertifiedKeypair"};
+
+
+// public static final String[] CERTIFICATES_KEYS = new String[] {
+// "SecureSignatureKeypair",
+// "CertifiedKeypair",
+// "00",
+// "01",
+// "02",
+// "03",
+// "04",
+// "05",
+// "06",
+// "07",
+// "08",
+// "09",
+// "10",
+// "11",
+// "12",
+// "13",
+// "14"};
@Override
public String getIdentifier() {
@@ -128,8 +133,7 @@ public class CertificatesInfoboxImpl extends AbstractAssocArrayInfobox {
return new HashMap<String, Object>();
}
-
-
}
+
}