From e8b488d309f94321d374883368389f3206007495 Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Wed, 19 Sep 2018 10:07:27 +0200 Subject: mac mocca.app template renewed, important crypto libraries updated --- BKULocal/pom.xml | 2 +- Mocca-Installer/installer/create_installer.sh | 2 +- .../files/mac/Mocca.app/Contents/Info.plist | Bin 1682 -> 784 bytes .../Java/BKUCertificates-1.1.17-SNAPSHOT.jar | Bin 324992 -> 0 bytes .../Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar | Bin 18248528 -> 0 bytes .../Mocca.app/Contents/Java/FastInfoset-1.2.13.jar | Bin 316447 -> 0 bytes .../mac/Mocca.app/Contents/Java/commons-io-2.5.jar | Bin 223375 -> 0 bytes .../Contents/Java/iaik_eccelerate-3.01.jar | Bin 360910 -> 0 bytes .../Contents/Java/iaik_jce_full_signed-5.5.jar | Bin 1246087 -> 0 bytes .../Contents/Java/iaik_xsect_signed-1.17.jar | Bin 383964 -> 0 bytes .../mac/Mocca.app/Contents/Java/img/chip128.png | Bin 7775 -> 0 bytes .../mac/Mocca.app/Contents/Java/img/chip16.png | Bin 787 -> 0 bytes .../mac/Mocca.app/Contents/Java/img/chip24.png | Bin 1227 -> 0 bytes .../mac/Mocca.app/Contents/Java/img/chip32.png | Bin 1753 -> 0 bytes .../mac/Mocca.app/Contents/Java/img/chip48.png | Bin 2771 -> 0 bytes .../mac/Mocca.app/Contents/Java/img/splash.png | Bin 41455 -> 0 bytes .../mac/Mocca.app/Contents/Java/img/version.xml | 52 -- .../Contents/Java/istack-commons-runtime-3.0.5.jar | Bin 30207 -> 0 bytes .../mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar | Bin 141177 -> 0 bytes .../Mocca.app/Contents/Java/jaxb-core-2.3.0.jar | Bin 172835 -> 0 bytes .../Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar | Bin 1017547 -> 0 bytes .../mac/Mocca.app/Contents/Java/jetty-6.1.19.jar | Bin 555052 -> 0 bytes .../Mocca.app/Contents/Java/jetty-util-6.1.19.jar | Bin 187994 -> 0 bytes .../mac/Mocca.app/Contents/Java/log4j-1.2.17.jar | Bin 521905 -> 0 bytes .../files/mac/Mocca.app/Contents/Java/mocca.jnlp | 94 ---- .../files/mac/Mocca.app/Contents/Java/player.jnlp | 3 - .../Contents/Java/servlet-api-2.5-20081211.jar | Bin 144393 -> 0 bytes .../mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar | Bin 357880 -> 0 bytes .../Mocca.app/Contents/Java/slf4j-api-1.6.4.jar | Bin 31899 -> 0 bytes .../Contents/Java/slf4j-log4j12-1.6.4.jar | Bin 13965 -> 0 bytes .../mac/Mocca.app/Contents/Java/stax-api-1.0.jar | Bin 33174 -> 0 bytes .../mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar | Bin 39921 -> 0 bytes .../mac/Mocca.app/Contents/Java/txw2-2.3.0.jar | Bin 78160 -> 0 bytes .../Contents/Java/utils-1.3.35-SNAPSHOT.jar | Bin 507028 -> 0 bytes .../mac/Mocca.app/Contents/MacOS/JavaAppLauncher | Bin 18604 -> 0 bytes .../files/mac/Mocca.app/Contents/MacOS/Mocca | Bin 0 -> 119104 bytes .../Mocca.app/Contents/Resources/AppSettings.plist | Bin 0 -> 488 bytes .../Contents/Resources/MainMenu.nib/designable.nib | 569 +++++++++++++++++++++ .../Resources/MainMenu.nib/keyedobjects.nib | Bin 0 -> 28926 bytes .../mac/Mocca.app/Contents/Resources/appIcon.icns | Bin 0 -> 45926 bytes .../bin/BKUCertificates-1.1.17-SNAPSHOT.jar | Bin 0 -> 324990 bytes .../Contents/Resources/bin/FastInfoset-1.2.13.jar | Bin 0 -> 316447 bytes .../Contents/Resources/bin/commons-io-2.5.jar | Bin 0 -> 223375 bytes .../Contents/Resources/bin/iaik_eccelerate-5.0.jar | Bin 0 -> 572329 bytes .../Resources/bin/iaik_jce_full_signed-5.52.jar | Bin 0 -> 1261696 bytes .../Contents/Resources/bin/iaik_xsect-2.13.jar | Bin 0 -> 416312 bytes .../Resources/bin/istack-commons-runtime-3.0.5.jar | Bin 0 -> 30207 bytes .../Contents/Resources/bin/jaxb-api-2.3.0.jar | Bin 0 -> 141177 bytes .../Contents/Resources/bin/jaxb-core-2.3.0.jar | Bin 0 -> 172835 bytes .../Contents/Resources/bin/jaxb-runtime-2.3.0.jar | Bin 0 -> 1017547 bytes .../Contents/Resources/bin/jetty-6.1.19.jar | Bin 0 -> 555052 bytes .../Contents/Resources/bin/jetty-util-6.1.19.jar | Bin 0 -> 187994 bytes .../Contents/Resources/bin/log4j-1.2.17.jar | Bin 0 -> 521905 bytes .../mac/Mocca.app/Contents/Resources/bin/mocca.jar | Bin 0 -> 18614983 bytes .../Resources/bin/servlet-api-2.5-20081211.jar | Bin 0 -> 144393 bytes .../Contents/Resources/bin/sjsxp-1.0.2.jar | Bin 0 -> 357880 bytes .../Contents/Resources/bin/slf4j-api-1.6.4.jar | Bin 0 -> 31899 bytes .../Contents/Resources/bin/slf4j-log4j12-1.6.4.jar | Bin 0 -> 13965 bytes .../Contents/Resources/bin/stax-api-1.0.jar | Bin 0 -> 33174 bytes .../Contents/Resources/bin/stax-ex-1.7.8.jar | Bin 0 -> 39921 bytes .../Contents/Resources/bin/txw2-2.3.0.jar | Bin 0 -> 78160 bytes .../Resources/bin/utils-1.3.35-SNAPSHOT.jar | Bin 0 -> 507054 bytes .../Resources/en.lproj/Localizable.strings | 3 - .../files/mac/Mocca.app/Contents/Resources/script | 3 + Mocca-Installer/installer/files/mac/mocca_mac.sh | 6 +- bkucommon/pom.xml | 7 +- .../slcommands/impl/xsect/STALSignatureMethod.java | 283 +++++----- .../bku/slcommands/impl/cms/SignatureTest.java | 260 +++++----- pom.xml | 15 +- utils/pom.xml | 2 +- .../java/at/gv/egiz/updater/NewVersionDialog.java | 3 + 71 files changed, 861 insertions(+), 443 deletions(-) delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUCertificates-1.1.17-SNAPSHOT.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/FastInfoset-1.2.13.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/commons-io-2.5.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_eccelerate-3.01.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_jce_full_signed-5.5.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_xsect_signed-1.17.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip128.png delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip16.png delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip24.png delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip32.png delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip48.png delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/splash.png delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/version.xml delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/istack-commons-runtime-3.0.5.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-core-2.3.0.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-6.1.19.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-util-6.1.19.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/log4j-1.2.17.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/mocca.jnlp delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/player.jnlp delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/servlet-api-2.5-20081211.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-api-1.6.4.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-log4j12-1.6.4.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-api-1.0.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/txw2-2.3.0.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/utils-1.3.35-SNAPSHOT.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/JavaAppLauncher create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/Mocca create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/AppSettings.plist create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/designable.nib create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/keyedobjects.nib create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/appIcon.icns create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/BKUCertificates-1.1.17-SNAPSHOT.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/FastInfoset-1.2.13.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/commons-io-2.5.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_eccelerate-5.0.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_jce_full_signed-5.52.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_xsect-2.13.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/istack-commons-runtime-3.0.5.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-api-2.3.0.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-core-2.3.0.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-runtime-2.3.0.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-6.1.19.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-util-6.1.19.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/log4j-1.2.17.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/mocca.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/servlet-api-2.5-20081211.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/sjsxp-1.0.2.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-api-1.6.4.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-log4j12-1.6.4.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-api-1.0.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-ex-1.7.8.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/txw2-2.3.0.jar create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/utils-1.3.35-SNAPSHOT.jar delete mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/en.lproj/Localizable.strings create mode 100644 Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/script diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 922a9b51..6be593c9 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -144,7 +144,7 @@ iaik - iaik_xsect_signed + iaik_xsect iaik diff --git a/Mocca-Installer/installer/create_installer.sh b/Mocca-Installer/installer/create_installer.sh index 72a5b2cf..e2a18bc8 100644 --- a/Mocca-Installer/installer/create_installer.sh +++ b/Mocca-Installer/installer/create_installer.sh @@ -62,7 +62,7 @@ echo generating linux zip... done! echo generating mac app... cd mac rm -rf Mocca.app/Contents/Java/* -cp -r bin/ Mocca.app/Contents/Java/ +cp -r bin/* Mocca.app/Contents/Resources/bin/ cd .. echo generating mac app... done! diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Info.plist b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Info.plist index eb4095cc..fef18036 100644 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Info.plist and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Info.plist differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUCertificates-1.1.17-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUCertificates-1.1.17-SNAPSHOT.jar deleted file mode 100644 index 661a1cd1..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUCertificates-1.1.17-SNAPSHOT.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar deleted file mode 100644 index 9e603941..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/FastInfoset-1.2.13.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/FastInfoset-1.2.13.jar deleted file mode 100644 index 2501c271..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/FastInfoset-1.2.13.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/commons-io-2.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/commons-io-2.5.jar deleted file mode 100644 index 8d9a5e37..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/commons-io-2.5.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_eccelerate-3.01.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_eccelerate-3.01.jar deleted file mode 100644 index 9d5cacce..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_eccelerate-3.01.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_jce_full_signed-5.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_jce_full_signed-5.5.jar deleted file mode 100644 index 821cbd9d..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_jce_full_signed-5.5.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_xsect_signed-1.17.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_xsect_signed-1.17.jar deleted file mode 100644 index e786aa68..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_xsect_signed-1.17.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip128.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip128.png deleted file mode 100644 index c36d8079..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip128.png and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip16.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip16.png deleted file mode 100644 index 96b580e9..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip16.png and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip24.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip24.png deleted file mode 100644 index efd6dbeb..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip24.png and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip32.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip32.png deleted file mode 100644 index e7efb020..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip32.png and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip48.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip48.png deleted file mode 100644 index 491fbcac..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip48.png and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/splash.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/splash.png deleted file mode 100644 index 597fbc60..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/splash.png and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/version.xml b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/version.xml deleted file mode 100644 index 944406eb..00000000 --- a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/version.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - chip16.png - 2.0 - - chip16.png - - - - chip24.png - 2.0 - - chip24.png - - - - chip32.png - 2.0 - - chip32.png - - - - chip48.png - 2.0 - - chip48.png - - - - chip64.png - 2.0 - - chip64.png - - - - chip128.png - 2.0 - - chip128.png - - - - splash.png - 2.0 - - splash.png - - diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/istack-commons-runtime-3.0.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/istack-commons-runtime-3.0.5.jar deleted file mode 100644 index 52483bbd..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/istack-commons-runtime-3.0.5.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar deleted file mode 100644 index 5495d3fb..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-core-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-core-2.3.0.jar deleted file mode 100644 index a5791ae8..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-core-2.3.0.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar deleted file mode 100644 index 684e3d40..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-6.1.19.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-6.1.19.jar deleted file mode 100644 index bec744e4..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-6.1.19.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-util-6.1.19.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-util-6.1.19.jar deleted file mode 100644 index 771f89ee..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-util-6.1.19.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/log4j-1.2.17.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/log4j-1.2.17.jar deleted file mode 100644 index 6489ab52..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/log4j-1.2.17.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/mocca.jnlp b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/mocca.jnlp deleted file mode 100644 index 8575eda8..00000000 --- a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/mocca.jnlp +++ /dev/null @@ -1,94 +0,0 @@ - - - - - MOCCA Webstart Unstable - E-Government Innovationszentrum (EGIZ) - - MOCCA Webstart - Unstable Build - MOCCA Webstart Unstable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/player.jnlp b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/player.jnlp deleted file mode 100644 index d4f97dbc..00000000 --- a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/player.jnlp +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/servlet-api-2.5-20081211.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/servlet-api-2.5-20081211.jar deleted file mode 100644 index b5447355..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/servlet-api-2.5-20081211.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar deleted file mode 100644 index 9ee61671..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-api-1.6.4.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-api-1.6.4.jar deleted file mode 100644 index c0e8273e..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-api-1.6.4.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-log4j12-1.6.4.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-log4j12-1.6.4.jar deleted file mode 100644 index 7aca6728..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-log4j12-1.6.4.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-api-1.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-api-1.0.jar deleted file mode 100644 index 82422e32..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-api-1.0.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar deleted file mode 100644 index 81e56f9c..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/txw2-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/txw2-2.3.0.jar deleted file mode 100644 index 613b55b1..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/txw2-2.3.0.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/utils-1.3.35-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/utils-1.3.35-SNAPSHOT.jar deleted file mode 100644 index ec4a104f..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/utils-1.3.35-SNAPSHOT.jar and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/JavaAppLauncher b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/JavaAppLauncher deleted file mode 100644 index 7bddebea..00000000 Binary files a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/JavaAppLauncher and /dev/null differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/Mocca b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/Mocca new file mode 100644 index 00000000..d4f44596 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/Mocca differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/AppSettings.plist b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/AppSettings.plist new file mode 100644 index 00000000..5bcfa127 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/AppSettings.plist differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/designable.nib b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/designable.nib new file mode 100644 index 00000000..014a9a73 --- /dev/null +++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/designable.nib @@ -0,0 +1,569 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/keyedobjects.nib b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/keyedobjects.nib new file mode 100644 index 00000000..8d206926 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/MainMenu.nib/keyedobjects.nib differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/appIcon.icns b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/appIcon.icns new file mode 100644 index 00000000..befa4763 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/appIcon.icns differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/BKUCertificates-1.1.17-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/BKUCertificates-1.1.17-SNAPSHOT.jar new file mode 100644 index 00000000..466c2818 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/BKUCertificates-1.1.17-SNAPSHOT.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/FastInfoset-1.2.13.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/FastInfoset-1.2.13.jar new file mode 100644 index 00000000..2169895e Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/FastInfoset-1.2.13.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/commons-io-2.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/commons-io-2.5.jar new file mode 100644 index 00000000..b08b202f Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/commons-io-2.5.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_eccelerate-5.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_eccelerate-5.0.jar new file mode 100644 index 00000000..28733b1e Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_eccelerate-5.0.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_jce_full_signed-5.52.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_jce_full_signed-5.52.jar new file mode 100644 index 00000000..9fff510e Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_jce_full_signed-5.52.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_xsect-2.13.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_xsect-2.13.jar new file mode 100644 index 00000000..4a848160 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/iaik_xsect-2.13.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/istack-commons-runtime-3.0.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/istack-commons-runtime-3.0.5.jar new file mode 100644 index 00000000..979d8b0a Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/istack-commons-runtime-3.0.5.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-api-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-api-2.3.0.jar new file mode 100644 index 00000000..21e79c83 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-api-2.3.0.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-core-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-core-2.3.0.jar new file mode 100644 index 00000000..fe441c5f Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-core-2.3.0.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-runtime-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-runtime-2.3.0.jar new file mode 100644 index 00000000..cebbac8c Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jaxb-runtime-2.3.0.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-6.1.19.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-6.1.19.jar new file mode 100644 index 00000000..0bdc3ded Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-6.1.19.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-util-6.1.19.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-util-6.1.19.jar new file mode 100644 index 00000000..2cf57254 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/jetty-util-6.1.19.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/log4j-1.2.17.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/log4j-1.2.17.jar new file mode 100644 index 00000000..01688dcf Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/log4j-1.2.17.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/mocca.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/mocca.jar new file mode 100644 index 00000000..82a2da8d Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/mocca.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/servlet-api-2.5-20081211.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/servlet-api-2.5-20081211.jar new file mode 100644 index 00000000..1764d3fc Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/servlet-api-2.5-20081211.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/sjsxp-1.0.2.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/sjsxp-1.0.2.jar new file mode 100644 index 00000000..9cc13eae Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/sjsxp-1.0.2.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-api-1.6.4.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-api-1.6.4.jar new file mode 100644 index 00000000..fcf4a65f Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-api-1.6.4.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-log4j12-1.6.4.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-log4j12-1.6.4.jar new file mode 100644 index 00000000..db02d71c Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/slf4j-log4j12-1.6.4.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-api-1.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-api-1.0.jar new file mode 100644 index 00000000..1a0fe1ce Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-api-1.0.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-ex-1.7.8.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-ex-1.7.8.jar new file mode 100644 index 00000000..38838771 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/stax-ex-1.7.8.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/txw2-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/txw2-2.3.0.jar new file mode 100644 index 00000000..8f0cc0d5 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/txw2-2.3.0.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/utils-1.3.35-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/utils-1.3.35-SNAPSHOT.jar new file mode 100644 index 00000000..a55b05c8 Binary files /dev/null and b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/bin/utils-1.3.35-SNAPSHOT.jar differ diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/en.lproj/Localizable.strings b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/en.lproj/Localizable.strings deleted file mode 100644 index 0d306aaa..00000000 --- a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/en.lproj/Localizable.strings +++ /dev/null @@ -1,3 +0,0 @@ -"JRELoadError" = "Unable to load Java Runtime Environment."; -"MainClassNameRequired" = "Main class name is required."; -"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents."; diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/script b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/script new file mode 100644 index 00000000..d0b97b22 --- /dev/null +++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/script @@ -0,0 +1,3 @@ +#!/bin/sh +#This is a start script for mocca on mac +java -Djavax.net.ssl.trustStoreType=jks -Djavax.net.ssl.keyStoreType=jks -jar ./bin/mocca.jar \ No newline at end of file diff --git a/Mocca-Installer/installer/files/mac/mocca_mac.sh b/Mocca-Installer/installer/files/mac/mocca_mac.sh index ed26750e..921df76e 100644 --- a/Mocca-Installer/installer/files/mac/mocca_mac.sh +++ b/Mocca-Installer/installer/files/mac/mocca_mac.sh @@ -1,3 +1,3 @@ -#!/bin/sh -#This is a start script for mocca on mac -java -Djavax.net.ssl.trustStoreType=jks -Djavax.net.ssl.keyStoreType=jks -jar "BKUWebStart-1.3.35-SNAPSHOT.jar" +#!/bin/sh +#This is a start script for mocca on mac +java -Djavax.net.ssl.trustStoreType=jks -Djavax.net.ssl.keyStoreType=jks -jar "mocca.jar" diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml index d8686d1d..9db73aa1 100644 --- a/bkucommon/pom.xml +++ b/bkucommon/pom.xml @@ -96,7 +96,7 @@ iaik - iaik_xsect_signed + iaik_xsect iaik @@ -107,11 +107,6 @@ iaik_pki compile - - iaik - iaik_ecc_signed - compile - org.springframework spring-context diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignatureMethod.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignatureMethod.java index 1a6f6df9..a9eba7e8 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignatureMethod.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignatureMethod.java @@ -1,139 +1,144 @@ -/* - * Copyright 2011 by Graz University of Technology, Austria - * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint - * initiative of the Federal Chancellery Austria and Graz University of Technology. - * - * 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://www.osor.eu/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. - * - * This product combines work with different licenses. See the "NOTICE" text - * file for details on the various modules and licenses. - * The "NOTICE" text file is part of the distribution. Any derivative works - * that you distribute must include a readable copy of the "NOTICE" text file. - */ - - - -package at.gv.egiz.bku.slcommands.impl.xsect; - -import iaik.xml.crypto.dsig.AbstractSignatureMethodImpl; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.security.InvalidAlgorithmParameterException; -import java.security.Key; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.xml.crypto.XMLCryptoContext; -import javax.xml.crypto.dsig.XMLSignatureException; -import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec; - -import at.gv.egiz.bku.slcommands.impl.DataObjectHashDataInput; -import at.gv.egiz.bku.slexceptions.SLViewerException; -import at.gv.egiz.bku.utils.StreamUtil; -import at.gv.egiz.stal.ErrorResponse; -import at.gv.egiz.stal.HashDataInput; -import at.gv.egiz.stal.STAL; -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; - -public class STALSignatureMethod extends AbstractSignatureMethodImpl { - - /** - * Creates a new instance of this STALSignatureMethod - * with the given algorithm and params. - * - * @param algorithm the algorithm URI - * @param params optional algorithm parameters - * @throws InvalidAlgorithmParameterException if the specified parameters - * are inappropriate for the requested algorithm - * @throws NoSuchAlgorithmException if an implementation of the specified - * algorithm cannot be found - * @throws NullPointerException if algorithm is null - */ - public STALSignatureMethod(String algorithm, - SignatureMethodParameterSpec params) - throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { - super(algorithm, params); - } - - @Override - public byte[] calculateSignatureValue(XMLCryptoContext context, Key key, InputStream message) - throws XMLSignatureException, IOException { - - if (!(key instanceof STALPrivateKey)) { - throw new XMLSignatureException("STALSignatureMethod expects STALPrivateKey."); - } - - STAL stal = ((STALPrivateKey) key).getStal(); - String keyboxIdentifier = ((STALPrivateKey) key).getKeyboxIdentifier(); - List dataObjects = ((STALPrivateKey) key).getDataObjects(); - - List hashDataInputs = new ArrayList(); - for (DataObject dataObject : dataObjects) { - try { - dataObject.validateHashDataInput(); - } catch (SLViewerException e) { - throw new XMLSignatureException(e); - } - hashDataInputs.add(new DataObjectHashDataInput(dataObject)); - } - - ByteArrayOutputStream m = new ByteArrayOutputStream(); - StreamUtil.copyStream(message, m); - - SignRequest signRequest = new SignRequest(); - signRequest.setKeyIdentifier(keyboxIdentifier); - SignedInfo signedInfo = new SignedInfo(); - signedInfo.setValue(m.toByteArray()); - signRequest.setSignedInfo(signedInfo); - signRequest.setHashDataInput(hashDataInputs); - - List responses = - stal.handleRequest(Collections.singletonList((STALRequest) signRequest)); - - if (responses == null || responses.size() != 1) { - throw new XMLSignatureException("Failed to access STAL."); - } - - STALResponse response = responses.get(0); - if (response instanceof SignResponse) { - return ((SignResponse) response).getSignatureValue(); - } else if (response instanceof ErrorResponse) { - ErrorResponse err = (ErrorResponse) response; - STALSignatureException se = new STALSignatureException(err.getErrorCode(), err.getErrorMessage()); - throw new XMLSignatureException(se); - } else { - throw new XMLSignatureException("Failed to access STAL."); - } - - } - - @Override - public boolean validateSignatureValue(XMLCryptoContext context, Key key, byte[] value, - InputStream message) throws XMLSignatureException, IOException { - throw new XMLSignatureException("The STALSignatureMethod does not support validation."); - } - - @Override - protected Class getParameterSpecClass() { - return null; - } - -} +/* + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * 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://www.osor.eu/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. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. + */ + +package at.gv.egiz.bku.slcommands.impl.xsect; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.security.InvalidAlgorithmParameterException; +import java.security.Key; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.crypto.XMLCryptoContext; +import javax.xml.crypto.dsig.XMLSignatureException; +import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec; + +import at.gv.egiz.bku.slcommands.impl.DataObjectHashDataInput; +import at.gv.egiz.bku.slexceptions.SLViewerException; +import at.gv.egiz.bku.utils.StreamUtil; +import at.gv.egiz.stal.ErrorResponse; +import at.gv.egiz.stal.HashDataInput; +import at.gv.egiz.stal.STAL; +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 iaik.xml.crypto.dsig.SignatureMethodImpl; + +public class STALSignatureMethod extends SignatureMethodImpl { + + /** + * Creates a new instance of this STALSignatureMethod with the + * given algorithm and params. + * + * @param algorithm + * the algorithm URI + * @param params + * optional algorithm parameters + * @throws InvalidAlgorithmParameterException + * if the specified parameters are inappropriate for the requested + * algorithm + * @throws NoSuchAlgorithmException + * if an implementation of the specified algorithm cannot be found + * @throws NullPointerException + * if algorithm is null + */ + public STALSignatureMethod(String algorithm, SignatureMethodParameterSpec params) + throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { + super(algorithm, params); + } + + @Override + public byte[] calculateSignatureValue(XMLCryptoContext context, Key key, InputStream message) + throws XMLSignatureException, IOException { + + if (!(key instanceof STALPrivateKey)) { + throw new XMLSignatureException("STALSignatureMethod expects STALPrivateKey."); + } + + STAL stal = ((STALPrivateKey) key).getStal(); + String keyboxIdentifier = ((STALPrivateKey) key).getKeyboxIdentifier(); + List dataObjects = ((STALPrivateKey) key).getDataObjects(); + + List hashDataInputs = new ArrayList(); + for (DataObject dataObject : dataObjects) { + try { + dataObject.validateHashDataInput(); + } catch (SLViewerException e) { + throw new XMLSignatureException(e); + } + hashDataInputs.add(new DataObjectHashDataInput(dataObject)); + } + + ByteArrayOutputStream m = new ByteArrayOutputStream(); + StreamUtil.copyStream(message, m); + + SignRequest signRequest = new SignRequest(); + signRequest.setKeyIdentifier(keyboxIdentifier); + SignedInfo signedInfo = new SignedInfo(); + signedInfo.setValue(m.toByteArray()); + signRequest.setSignedInfo(signedInfo); + signRequest.setHashDataInput(hashDataInputs); + + List responses = stal.handleRequest(Collections.singletonList((STALRequest) signRequest)); + + if (responses == null || responses.size() != 1) { + throw new XMLSignatureException("Failed to access STAL."); + } + + STALResponse response = responses.get(0); + if (response instanceof SignResponse) { + return ((SignResponse) response).getSignatureValue(); + } else if (response instanceof ErrorResponse) { + ErrorResponse err = (ErrorResponse) response; + STALSignatureException se = new STALSignatureException(err.getErrorCode(), err.getErrorMessage()); + throw new XMLSignatureException(se); + } else { + throw new XMLSignatureException("Failed to access STAL."); + } + + } + + @Override + public boolean validateSignatureValue(XMLCryptoContext context, Key key, byte[] value, InputStream message) + throws XMLSignatureException, IOException { + throw new XMLSignatureException("The STALSignatureMethod does not support validation."); + } + +// @Override +// protected Class getParameterSpecClass() { +// return null; +// } + + @Override + public boolean validateSignatureValue(Key key, byte[] value, InputStream message) throws XMLSignatureException, IOException { + throw new XMLSignatureException("The STALSignatureMethod does not support validation."); + } + + +} diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/cms/SignatureTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/cms/SignatureTest.java index 56229b83..f17b0329 100644 --- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/cms/SignatureTest.java +++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/cms/SignatureTest.java @@ -1,130 +1,130 @@ -package at.gv.egiz.bku.slcommands.impl.cms; - -import static org.junit.Assert.*; - -import java.io.ByteArrayInputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.Charset; -import java.security.MessageDigest; -import java.util.Date; - -import org.junit.BeforeClass; -import org.junit.Test; -import org.w3._2000._09.xmldsig_.DigestMethodType; - -import at.buergerkarte.namespaces.securitylayer._1_2_3.Base64OptRefContentType; -import at.buergerkarte.namespaces.securitylayer._1_2_3.CMSDataObjectRequiredMetaType; -import at.buergerkarte.namespaces.securitylayer._1_2_3.DigestAndRefType; -import at.buergerkarte.namespaces.securitylayer._1_2_3.MetaInfoType; -import at.gv.egiz.stal.dummy.DummySTAL; -import iaik.asn1.ObjectID; -import iaik.asn1.structures.AlgorithmID; -import iaik.cms.InvalidSignatureValueException; -import iaik.cms.SignedData; -import iaik.cms.SignerInfo; -import iaik.security.ecc.provider.ECCProvider; -import iaik.security.provider.IAIK; -import iaik.x509.X509Certificate; - -public class SignatureTest { - - private DummySTAL stal = new DummySTAL(); - - @BeforeClass - public static void setUpClass() { - IAIK.addAsProvider(); - ECCProvider.addAsProvider(); - } - - @Test - public void testSignCMSDataObject() throws Exception { - - byte[] plaintext = "Plaintext".getBytes(Charset.forName("UTF-8")); - - CMSDataObjectRequiredMetaType dataObject = new CMSDataObjectRequiredMetaType(); - Base64OptRefContentType base64OptRefContentType = new Base64OptRefContentType(); - base64OptRefContentType.setBase64Content(plaintext); - dataObject.setContent(base64OptRefContentType); - MetaInfoType metaInfoType = new MetaInfoType(); - metaInfoType.setMimeType("text/plain"); - dataObject.setMetaInfo(metaInfoType); - - Signature signature = new Signature(dataObject, "detached", stal.getCert(), new Date(), null, true); - byte[] cmsSignature = signature.sign(stal, "SecureSignatureKeypair"); - - SignedData signedData = new SignedData(new ByteArrayInputStream(cmsSignature)); - signedData.setContent(plaintext); - assertEquals(ObjectID.pkcs7_data, signedData.getEncapsulatedContentType()); - SignerInfo[] signerInfos = signedData.getSignerInfos(); - assertEquals(1, signerInfos.length); - SignerInfo signerInfo = signerInfos[0]; - signedData.verify((X509Certificate) stal.getCert()); - assertEquals(AlgorithmID.sha1, signerInfo.getDigestAlgorithm()); - assertEquals(AlgorithmID.sha1WithRSAEncryption, signerInfo.getSignatureAlgorithm()); - - System.out.println(AlgorithmID.sha1); - - } - - @Test - public void testSignCMSReferenceSha1() throws Exception { - testSignCMSReference(AlgorithmID.sha1); - } - - //TODO Why doesn't it work this way?? - @Test(expected = InvalidSignatureValueException.class) - public void testSignCMSReferenceSha256() throws Exception { - testSignCMSReference(AlgorithmID.sha256); - } - - private void testSignCMSReference(AlgorithmID digestAlgorithmID) throws Exception { - - byte[] plaintext = "Plaintext".getBytes(Charset.forName("UTF-8")); - - MessageDigest messageDigest = MessageDigest.getInstance(digestAlgorithmID.getImplementationName()); - byte[] digestValue = messageDigest.digest(plaintext); - - CMSDataObjectRequiredMetaType dataObject = new CMSDataObjectRequiredMetaType(); - DigestAndRefType digestAndRefType = new DigestAndRefType(); - DigestMethodType digestMethodType = new DigestMethodType(); - digestMethodType.setAlgorithm("URN:OID:" + digestAlgorithmID.getAlgorithm().getID()); - digestAndRefType.setDigestMethod(digestMethodType); - digestAndRefType.setDigestValue(digestValue); - dataObject.setDigestAndRef(digestAndRefType); - MetaInfoType metaInfoType = new MetaInfoType(); - metaInfoType.setMimeType("text/plain"); - dataObject.setMetaInfo(metaInfoType); - - Signature signature = new Signature(dataObject, "detached", stal.getCert(), new Date(), null, true); - byte[] cmsSignature = signature.sign(stal, "SecureSignatureKeypair"); - - SignedData signedData = new SignedData(new ByteArrayInputStream(cmsSignature)); - signedData.setContent(plaintext); - assertEquals(ObjectID.pkcs7_data, signedData.getEncapsulatedContentType()); - SignerInfo[] signerInfos = signedData.getSignerInfos(); - assertEquals(1, signerInfos.length); - SignerInfo signerInfo = signerInfos[0]; - signedData.verify((X509Certificate) stal.getCert()); - assertEquals(digestAlgorithmID, signerInfo.getDigestAlgorithm()); - assertEquals(AlgorithmID.sha1WithRSAEncryption, signerInfo.getSignatureAlgorithm()); - - } - - @Test - public void test() throws URISyntaxException { - - String oid = null; - URI uri = new URI("URN:OID:1.3.14.3.2.26"); - String scheme = uri.getScheme(); - if ("URN".equalsIgnoreCase(scheme)) { - String schemeSpecificPart = uri.getSchemeSpecificPart().toLowerCase(); - if (schemeSpecificPart.startsWith("oid:")) { - oid = schemeSpecificPart.substring(4, schemeSpecificPart.length()); - } - } - assertEquals("1.3.14.3.2.26", oid); - - } - -} +package at.gv.egiz.bku.slcommands.impl.cms; + +import static org.junit.Assert.*; + +import java.io.ByteArrayInputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.Charset; +import java.security.MessageDigest; +import java.util.Date; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.w3._2000._09.xmldsig_.DigestMethodType; + +import at.buergerkarte.namespaces.securitylayer._1_2_3.Base64OptRefContentType; +import at.buergerkarte.namespaces.securitylayer._1_2_3.CMSDataObjectRequiredMetaType; +import at.buergerkarte.namespaces.securitylayer._1_2_3.DigestAndRefType; +import at.buergerkarte.namespaces.securitylayer._1_2_3.MetaInfoType; +import at.gv.egiz.stal.dummy.DummySTAL; +import iaik.asn1.ObjectID; +import iaik.asn1.structures.AlgorithmID; +import iaik.cms.InvalidSignatureValueException; +import iaik.cms.SignedData; +import iaik.cms.SignerInfo; +import iaik.security.ec.provider.ECCelerate; +import iaik.security.provider.IAIK; +import iaik.x509.X509Certificate; + +public class SignatureTest { + + private DummySTAL stal = new DummySTAL(); + + @BeforeClass + public static void setUpClass() { + IAIK.addAsProvider(); + ECCelerate.addAsProvider(); + } + + @Test + public void testSignCMSDataObject() throws Exception { + + byte[] plaintext = "Plaintext".getBytes(Charset.forName("UTF-8")); + + CMSDataObjectRequiredMetaType dataObject = new CMSDataObjectRequiredMetaType(); + Base64OptRefContentType base64OptRefContentType = new Base64OptRefContentType(); + base64OptRefContentType.setBase64Content(plaintext); + dataObject.setContent(base64OptRefContentType); + MetaInfoType metaInfoType = new MetaInfoType(); + metaInfoType.setMimeType("text/plain"); + dataObject.setMetaInfo(metaInfoType); + + Signature signature = new Signature(dataObject, "detached", stal.getCert(), new Date(), null, true); + byte[] cmsSignature = signature.sign(stal, "SecureSignatureKeypair"); + + SignedData signedData = new SignedData(new ByteArrayInputStream(cmsSignature)); + signedData.setContent(plaintext); + assertEquals(ObjectID.pkcs7_data, signedData.getEncapsulatedContentType()); + SignerInfo[] signerInfos = signedData.getSignerInfos(); + assertEquals(1, signerInfos.length); + SignerInfo signerInfo = signerInfos[0]; + signedData.verify((X509Certificate) stal.getCert()); + assertEquals(AlgorithmID.sha1, signerInfo.getDigestAlgorithm()); + assertEquals(AlgorithmID.sha1WithRSAEncryption, signerInfo.getSignatureAlgorithm()); + + System.out.println(AlgorithmID.sha1); + + } + + @Test + public void testSignCMSReferenceSha1() throws Exception { + testSignCMSReference(AlgorithmID.sha1); + } + + //TODO Why doesn't it work this way?? + @Test(expected = InvalidSignatureValueException.class) + public void testSignCMSReferenceSha256() throws Exception { + testSignCMSReference(AlgorithmID.sha256); + } + + private void testSignCMSReference(AlgorithmID digestAlgorithmID) throws Exception { + + byte[] plaintext = "Plaintext".getBytes(Charset.forName("UTF-8")); + + MessageDigest messageDigest = MessageDigest.getInstance(digestAlgorithmID.getImplementationName()); + byte[] digestValue = messageDigest.digest(plaintext); + + CMSDataObjectRequiredMetaType dataObject = new CMSDataObjectRequiredMetaType(); + DigestAndRefType digestAndRefType = new DigestAndRefType(); + DigestMethodType digestMethodType = new DigestMethodType(); + digestMethodType.setAlgorithm("URN:OID:" + digestAlgorithmID.getAlgorithm().getID()); + digestAndRefType.setDigestMethod(digestMethodType); + digestAndRefType.setDigestValue(digestValue); + dataObject.setDigestAndRef(digestAndRefType); + MetaInfoType metaInfoType = new MetaInfoType(); + metaInfoType.setMimeType("text/plain"); + dataObject.setMetaInfo(metaInfoType); + + Signature signature = new Signature(dataObject, "detached", stal.getCert(), new Date(), null, true); + byte[] cmsSignature = signature.sign(stal, "SecureSignatureKeypair"); + + SignedData signedData = new SignedData(new ByteArrayInputStream(cmsSignature)); + signedData.setContent(plaintext); + assertEquals(ObjectID.pkcs7_data, signedData.getEncapsulatedContentType()); + SignerInfo[] signerInfos = signedData.getSignerInfos(); + assertEquals(1, signerInfos.length); + SignerInfo signerInfo = signerInfos[0]; + signedData.verify((X509Certificate) stal.getCert()); + assertEquals(digestAlgorithmID, signerInfo.getDigestAlgorithm()); + assertEquals(AlgorithmID.sha1WithRSAEncryption, signerInfo.getSignatureAlgorithm()); + + } + + @Test + public void test() throws URISyntaxException { + + String oid = null; + URI uri = new URI("URN:OID:1.3.14.3.2.26"); + String scheme = uri.getScheme(); + if ("URN".equalsIgnoreCase(scheme)) { + String schemeSpecificPart = uri.getSchemeSpecificPart().toLowerCase(); + if (schemeSpecificPart.startsWith("oid:")) { + oid = schemeSpecificPart.substring(4, schemeSpecificPart.length()); + } + } + assertEquals("1.3.14.3.2.26", oid); + + } + +} diff --git a/pom.xml b/pom.xml index 7942daea..9cb1e529 100644 --- a/pom.xml +++ b/pom.xml @@ -327,7 +327,7 @@ iaik iaik_jce_full_signed - 5.5 + 5.52 compile @@ -338,17 +338,17 @@ iaik iaik_eccelerate - 3.01 + 5.0 iaik iaik_eccelerate_cms - 3.01 + 5.0 iaik - iaik_xsect_signed - 1.17 + iaik_xsect + 2.13 iaik @@ -361,11 +361,6 @@ 2.00-MOA-MOCCA compile - - iaik - iaik_ecc_signed - 2.19 - javax.servlet servlet-api diff --git a/utils/pom.xml b/utils/pom.xml index c880f177..51abae52 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -24,7 +24,7 @@ iaik - iaik_xsect_signed + iaik_xsect diff --git a/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java index 02b80fa7..674d8339 100644 --- a/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java +++ b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java @@ -1,4 +1,5 @@ /* + * Copyright 2018 by Graz University of Technology, Austria * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint * initiative of the Federal Chancellery Austria and Graz University of Technology. @@ -134,6 +135,8 @@ public class NewVersionDialog extends JDialog { @Override public void mouseClicked(MouseEvent e) { openLink(); + try { Thread.sleep(1000); } catch (InterruptedException e1) {} + close(); } }); okButton.setActionCommand("OK"); -- cgit v1.2.3