diff options
| author | Florian Zschocke <florian.zschocke@devolo.de> | 2019-11-10 13:02:07 +0100 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@devolo.de> | 2019-11-10 13:02:07 +0100 |
| commit | 5784b125b676d5d19897c66144552afedc92c655 (patch) | |
| tree | 8bd02d61b4ec279cd5f6305d25a0b00fa79c11c8 | |
| parent | 29133f2e84ecdb5de0a70ade6818163280b431ff (diff) | |
| download | gitblit-5784b125b676d5d19897c66144552afedc92c655.tar.gz gitblit-5784b125b676d5d19897c66144552afedc92c655.zip | |
Update BouncyCastle dependency to version 1.57
To support the new PBKDF2 password hashing, the Bouncy Castle provider
needs to be updated to a version that supports PBKDF2 with HMAC SHA265.
The current version doesn't have PBKDF2WithHmacSHA265, and neither does
Java 7, so that under Java 7 it can not be used. This update enables
the new password hashing under Java 7, too.
| -rw-r--r-- | .classpath | 11 | ||||
| -rw-r--r-- | build.moxie | 2 | ||||
| -rw-r--r-- | gitblit.iml | 18 |
3 files changed, 18 insertions, 13 deletions
@@ -51,9 +51,9 @@ <classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" /> <classpathentry kind="lib" path="ext/org.eclipse.jdt.annotation-1.1.0.jar" sourcepath="ext/src/org.eclipse.jdt.annotation-1.1.0.jar" /> <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" /> - <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.52.jar" sourcepath="ext/src/bcprov-jdk15on-1.52.jar" /> - <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.52.jar" sourcepath="ext/src/bcmail-jdk15on-1.52.jar" /> - <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.52.jar" sourcepath="ext/src/bcpkix-jdk15on-1.52.jar" /> + <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.57.jar" sourcepath="ext/src/bcprov-jdk15on-1.57.jar" /> + <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.57.jar" sourcepath="ext/src/bcmail-jdk15on-1.57.jar" /> + <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.57.jar" sourcepath="ext/src/bcpkix-jdk15on-1.57.jar" /> <classpathentry kind="lib" path="ext/sshd-core-1.0.0.jar" sourcepath="ext/src/sshd-core-1.0.0.jar" /> <classpathentry kind="lib" path="ext/mina-core-2.0.9.jar" sourcepath="ext/src/mina-core-2.0.9.jar" /> <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" /> @@ -95,5 +95,10 @@ <classpathentry kind="lib" path="ext/mockito-core-1.10.19.jar" sourcepath="ext/src/mockito-core-1.10.19.jar" /> <classpathentry kind="lib" path="ext/objenesis-2.1.jar" sourcepath="ext/src/objenesis-2.1.jar" /> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> + <classpathentry kind="src" path="src/main/dagger"> + <attributes> + <attribute name="optional" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin/classes" /> </classpath> diff --git a/build.moxie b/build.moxie index e58b6c6d..b8dc3efc 100644 --- a/build.moxie +++ b/build.moxie @@ -109,7 +109,7 @@ properties: { lucene.version : 5.5.2 jgit.version : 4.1.1.201511131810-r groovy.version : 2.4.4 - bouncycastle.version : 1.52 + bouncycastle.version : 1.57 selenium.version : 2.28.0 wikitext.version : 1.4 sshd.version: 1.0.0 diff --git a/gitblit.iml b/gitblit.iml index 51945b11..b82a27b1 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -508,35 +508,35 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="bcprov-jdk15on-1.52.jar"> + <library name="bcprov-jdk15on-1.57.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.52.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.57.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.52.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.57.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="bcmail-jdk15on-1.52.jar"> + <library name="bcmail-jdk15on-1.57.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.52.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.57.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.52.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.57.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="bcpkix-jdk15on-1.52.jar"> + <library name="bcpkix-jdk15on-1.57.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.52.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.57.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.52.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.57.jar!/" /> </SOURCES> </library> </orderEntry> |