Upgrade BouncyCastle to 1.52

2015-08-05 12:56:10 +00:00
parent d1e7eeb7bc
commit bab92e082f
7 changed files with 26 additions and 11 deletions
--- a/build.xml
+++ b/build.xml
@ -17,6 +17,9 @@
    <property name="jmock.archive" value="jmock-2.6.0-jars.zip"/>
    <property name="jmockcp" value="${lib}/jmock-2.6.0.jar:${lib}/hamcrest-core-1.3.jar:${lib}/hamcrest-library-1.3.jar:${lib}/jmock-legacy-2.6.0.jar:${lib}/cglib-nodep-2.2.3.jar:${lib}/objenesis-1.0.jar"/>
    <property name="jmock.url" value="http://jmock.org/downloads/${jmock.archive}"/>
+    <!-- BouncyCastle Provider -->
+    <property name="bcprov.filename" value="bcprov-jdk15on-152.jar"/>
+    <property name="bcprov.url" value="http://downloads.bouncycastle.org/java/bcprov-jdk15on-152.jar"/>
    <!-- Just one of the James .jars for checking presence of James, the .zip contains this and dependencies -->
    <property name="james.filename" value="apache-james-mailbox-api-0.6-20150508.040939-710.jar"/>
    <property name="james.archive" value="james-server-app-3.0.0-beta5-20150627.102412-1076-app.zip"/>
@ -73,7 +76,7 @@
        <pathelement location="${i2plib}/jstl.jar" />
        <pathelement location="${i2plib}/standard.jar" />
        <pathelement location="${lib}/mailapi.jar" />
-        <pathelement location="${lib}/bcprov-jdk15on-151.jar" />
+        <pathelement location="${lib}/${bcprov.filename}" />
        <pathelement location="${lib}/ntruenc-1.2.jar" />
        <pathelement location="${lib}/scrypt-1.4.0.jar" />
        <pathelement location="${lib}/lzma-9.20.jar" />
@ -123,6 +126,8 @@

    <!-- compiles everything under src/main/java, but not src/test/ or src/build/ -->
    <target name="compile" depends="checki2pbase">
+        <available property="bcprovexists" file="${lib}/${bcprov.filename}" type="file"/>
+        <ant target="downloadbcprov"/>
        <available property="jamesexists" file="${lib}/${james.filename}" type="file"/>
        <ant target="downloadjames"/>
        <available property="subethaexists" file="${lib}/${subetha.filename}" type="file"/>
@ -186,7 +191,7 @@
            <webinf dir="src/main/webapp/WEB-INF/tlds" includes="*.tld"/>
            <lib file="${lib}/i2pbote.jar"/>
            <lib file="${lib}/mailapi.jar"/>
-            <lib file="${lib}/bcprov-jdk15on-151.jar"/>
+            <lib file="${lib}/${bcprov.filename}"/>
            <lib file="${lib}/ntruenc-1.2.jar"/>
            <lib file="${lib}/scrypt-1.4.0.jar"/>
            <lib file="${lib}/lzma-9.20.jar"/>
@ -259,8 +264,8 @@
            <arg value="--effort=9"/>
            <arg value="--modification-time=latest"/>
            <arg value="--segment-limit=-1"/>
-            <arg value="plugin/plugin.tmp/lib/bcprov-jdk15on-151.jar.pack"/>
-            <arg value="${lib}/bcprov-jdk15on-151.jar"/>
+            <arg value="plugin/plugin.tmp/lib/${bcprov.filename}.pack"/>
+            <arg value="${lib}/${bcprov.filename}"/>
        </exec>
        <exec executable="pack200" failonerror="true">
            <arg value="--no-gzip"/>
@ -439,7 +444,7 @@
        <copy file="plugin/webapps.config" todir="${i2pinstallerplugindir}/console"/>
        <copy file="${lib}/i2pbote.jar" todir="${i2pinstallerplugindir}/lib"/>
        <copy file="${lib}/mailapi.jar" todir="${i2pinstallerplugindir}/lib"/>
-        <copy file="${lib}/bcprov-jdk15on-151.jar" todir="${i2pinstallerplugindir}/lib"/>
+        <copy file="${lib}/${bcprov.filename}" todir="${i2pinstallerplugindir}/lib"/>
        <copy file="${lib}/ntruenc-1.2.jar" todir="${i2pinstallerplugindir}/lib"/>
        <copy file="${lib}/scrypt-1.4.0.jar" todir="${i2pinstallerplugindir}/lib"/>
        <copy file="${lib}/lzma-9.20.jar" todir="${i2pinstallerplugindir}/lib"/>
@ -579,6 +584,16 @@
        <delete file="${lib}/${jmock.archive}"/>
    </target>

+    <target name="downloadbcprov" unless="bcprovexists">
+        <input message="BouncyCastle Provider not found, download now?" validargs="y,n" addproperty="userinput.bcprov"/>
+        <fail message="OK, aborting build.">
+            <condition>
+                <equals arg1="${userinput.bcprov}" arg2="n"/>
+            </condition>
+        </fail>
+        <get src="${bcprov.url}" verbose="true" dest="${lib}/${bcprov.filename}"/>
+    </target>
+
    <target name="downloadjames" unless="jamesexists">
        <input message="Apache James not found, download now?" validargs="y,n" addproperty="userinput.junit"/>
        <fail message="OK, aborting build.">
--- a/doc/techdoc.txt
+++ b/doc/techdoc.txt
@ -590,7 +590,7 @@ Here is a simplified diagram of how a Relay Return Packet is sent from one hop t

 6.2. Included .jar files and third-party source code

-  bcprov-jdk15on-151.jar     The BouncyCastle library and SecurityProvider.
+  bcprov-jdk15on-152.jar     The BouncyCastle library and SecurityProvider.
  mailapi.jar                Part of JavaMail 1.5.1
  lzma-9.20.jar              An LZMA implementation from http://www.7-zip.org/sdk.html
  ntruenc-1.2.jar            An NTRU implementation from http://sf.net/projects/ntru/
--- a/lib/bcprov-jdk15on-151.jar
+++ b/lib/bcprov-jdk15on-151.jar
--- a/license.txt
+++ b/license.txt
@ -4,7 +4,7 @@ LICENSES
 This software is licensed under the GPL version 3 (see licenses/GPLv3.txt),
 except for:

- bcprov-jdk15on-151.jar which is licensed under the Bouncy Castle License
+- bcprov-jdk15on-152.jar which is licensed under the Bouncy Castle License
  (see licenses/BouncyCastle.txt).
 - nl.jteam.tls.StrongTls which is licensed under the Apache License, Version
  2.0 (see licenses/LICENSE-Apache2.0.txt).
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@ -92,12 +92,12 @@
        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
            <compilation-unit>
                <package-root>test</package-root>
-                <classpath mode="compile">../i2p/core/java/build/i2p.jar:../i2p/apps/jetty/jettylib/org.mortbay.jetty.jar:../i2p/apps/jetty/jettylib/jasper-compiler.jar:../i2p/apps/jetty/jettylib/jasper-runtime.jar:../i2p/apps/jetty/jettylib/javax.servlet.jar:../i2p/apps/jetty/jettylib/commons-logging.jar:../i2p/apps/jetty/jettylib/commons-el.jar:../i2p/apps/susidns/src/WEB-INF/lib/jstl.jar:../i2p/apps/susidns/src/WEB-INF/lib/standard.jar:WebContent/WEB-INF/lib/mailapi.jar:WebContent/WEB-INF/lib/bcprov-jdk15on-151.jar:ant_build/classes:/usr/local/netbeans-6.5/platform9/modules/ext/junit-4.5.jar:../i2p/router/java/build/router.jar:WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar:WebContent/WEB-INF/lib/commons-io-1.4.jar</classpath>
+                <classpath mode="compile">../i2p/core/java/build/i2p.jar:../i2p/apps/jetty/jettylib/org.mortbay.jetty.jar:../i2p/apps/jetty/jettylib/jasper-compiler.jar:../i2p/apps/jetty/jettylib/jasper-runtime.jar:../i2p/apps/jetty/jettylib/javax.servlet.jar:../i2p/apps/jetty/jettylib/commons-logging.jar:../i2p/apps/jetty/jettylib/commons-el.jar:../i2p/apps/susidns/src/WEB-INF/lib/jstl.jar:../i2p/apps/susidns/src/WEB-INF/lib/standard.jar:WebContent/WEB-INF/lib/mailapi.jar:WebContent/WEB-INF/lib/bcprov-jdk15on-152.jar:ant_build/classes:/usr/local/netbeans-6.5/platform9/modules/ext/junit-4.5.jar:../i2p/router/java/build/router.jar:WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar:WebContent/WEB-INF/lib/commons-io-1.4.jar</classpath>
                <source-level>1.5</source-level>
            </compilation-unit>
            <compilation-unit>
                <package-root>src</package-root>
-                <classpath mode="compile">../i2p/core/java/build/i2p.jar:../i2p/apps/jetty/jettylib/org.mortbay.jetty.jar:../i2p/apps/jetty/jettylib/jasper-compiler.jar:../i2p/apps/jetty/jettylib/jasper-runtime.jar:../i2p/apps/jetty/jettylib/javax.servlet.jar:../i2p/apps/jetty/jettylib/commons-logging.jar:../i2p/apps/jetty/jettylib/commons-el.jar:../i2p/apps/susidns/src/WEB-INF/lib/jstl.jar:../i2p/apps/susidns/src/WEB-INF/lib/standard.jar:WebContent/WEB-INF/lib/mailapi.jar:WebContent/WEB-INF/lib/bcprov-jdk15on-151.jar:ant_build/classes:../i2p/apps/streaming/java/build/streaming.jar:../i2p/apps/ministreaming/java/build/mstreaming.jar:../i2p/apps/routerconsole/java/build/routerconsole.jar:../i2p/router/java/build/router.jar:WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar:WebContent/WEB-INF/lib/commons-io-1.4.jar</classpath>
+                <classpath mode="compile">../i2p/core/java/build/i2p.jar:../i2p/apps/jetty/jettylib/org.mortbay.jetty.jar:../i2p/apps/jetty/jettylib/jasper-compiler.jar:../i2p/apps/jetty/jettylib/jasper-runtime.jar:../i2p/apps/jetty/jettylib/javax.servlet.jar:../i2p/apps/jetty/jettylib/commons-logging.jar:../i2p/apps/jetty/jettylib/commons-el.jar:../i2p/apps/susidns/src/WEB-INF/lib/jstl.jar:../i2p/apps/susidns/src/WEB-INF/lib/standard.jar:WebContent/WEB-INF/lib/mailapi.jar:WebContent/WEB-INF/lib/bcprov-jdk15on-152.jar:ant_build/classes:../i2p/apps/streaming/java/build/streaming.jar:../i2p/apps/ministreaming/java/build/mstreaming.jar:../i2p/apps/routerconsole/java/build/routerconsole.jar:../i2p/router/java/build/router.jar:WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar:WebContent/WEB-INF/lib/commons-io-1.4.jar</classpath>
                <built-to>ant_build/classes</built-to>
                <source-level>1.5</source-level>
            </compilation-unit>
--- a/plugin/webapps.config
+++ b/plugin/webapps.config
@ -1 +1 @@
-webapps.i2pbote.classpath=$I2P/lib/jstl.jar,$I2P/lib/standard.jar,$PLUGIN/lib/i2pbote.jar,$PLUGIN/lib/mailapi.jar,$PLUGIN/lib/bcprov-jdk15on-151.jar,$PLUGIN/lib/flexi-gmss-1.7p1.jar,$PLUGIN/lib/ntruenc-1.2.jar,$PLUGIN/lib/scrypt-1.4.0.jar,$PLUGIN/lib/lzma-9.20.jar,$PLUGIN/lib/apache-james-mailbox-api-0.6-20150508.040939-710.jar,$PLUGIN/lib/apache-james-mailbox-store-0.6-20150508.041003-704.jar,$PLUGIN/lib/apache-mime4j-core-0.8.0-20150617.024907-738.jar,$PLUGIN/lib/commons-codec-1.7.jar,$PLUGIN/lib/commons-collections-3.2.1.jar,$PLUGIN/lib/commons-configuration-1.9.jar,$PLUGIN/lib/commons-io-2.4.jar,$PLUGIN/lib/commons-lang-2.6.jar,$PLUGIN/lib/james-server-filesystem-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-lifecycle-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-imap4-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-library-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-util-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/jcommon-1.0.23.jar,$PLUGIN/lib/jfreechart-1.0.19.jar,$PLUGIN/lib/jutf7-1.0.0.jar,$PLUGIN/lib/log4j-1.2.17.jar,$PLUGIN/lib/netty-3.3.1.Final.jar,$PLUGIN/lib/protocols-api-1.6.4-20150617.121129-1080.jar,$PLUGIN/lib/protocols-imap-1.6.4-20150617.121245-927.jar,$PLUGIN/lib/protocols-netty-1.6.4-20150617.121137-1044.jar,$PLUGIN/lib/slf4j-api-1.7.2.jar,$PLUGIN/lib/slf4j-log4j12-1.7.2.jar,$PLUGIN/lib/subethasmtp-3.1.7.jar
+webapps.i2pbote.classpath=$I2P/lib/jstl.jar,$I2P/lib/standard.jar,$PLUGIN/lib/i2pbote.jar,$PLUGIN/lib/mailapi.jar,$PLUGIN/lib/bcprov-jdk15on-152.jar,$PLUGIN/lib/flexi-gmss-1.7p1.jar,$PLUGIN/lib/ntruenc-1.2.jar,$PLUGIN/lib/scrypt-1.4.0.jar,$PLUGIN/lib/lzma-9.20.jar,$PLUGIN/lib/apache-james-mailbox-api-0.6-20150508.040939-710.jar,$PLUGIN/lib/apache-james-mailbox-store-0.6-20150508.041003-704.jar,$PLUGIN/lib/apache-mime4j-core-0.8.0-20150617.024907-738.jar,$PLUGIN/lib/commons-codec-1.7.jar,$PLUGIN/lib/commons-collections-3.2.1.jar,$PLUGIN/lib/commons-configuration-1.9.jar,$PLUGIN/lib/commons-io-2.4.jar,$PLUGIN/lib/commons-lang-2.6.jar,$PLUGIN/lib/james-server-filesystem-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-lifecycle-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-imap4-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-library-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-util-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/jcommon-1.0.23.jar,$PLUGIN/lib/jfreechart-1.0.19.jar,$PLUGIN/lib/jutf7-1.0.0.jar,$PLUGIN/lib/log4j-1.2.17.jar,$PLUGIN/lib/netty-3.3.1.Final.jar,$PLUGIN/lib/protocols-api-1.6.4-20150617.121129-1080.jar,$PLUGIN/lib/protocols-imap-1.6.4-20150617.121245-927.jar,$PLUGIN/lib/protocols-netty-1.6.4-20150617.121137-1044.jar,$PLUGIN/lib/slf4j-api-1.7.2.jar,$PLUGIN/lib/slf4j-log4j12-1.7.2.jar,$PLUGIN/lib/subethasmtp-3.1.7.jar
--- a/src/main/webapp/html/FAQ.html
+++ b/src/main/webapp/html/FAQ.html
@ -510,7 +510,7 @@ if enabled – I2P-Bote mails <em>paranoidly</em> anonymous.</p>
 <p>Of course!</p>

 <blockquote>This software is licensed under the GPL version 3 (see
-licenses/GPLv3.txt), except for bcprov-jdk15on-151.jar which is
+licenses/GPLv3.txt), except for the BouncyCastle Provider which is
 licensed under the Bouncy Castle License (see
 licenses/BouncyCastle.txt).</blockquote>