Browse Source

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.
tags/r1.9.0
Florian Zschocke 4 years ago
parent
commit
5784b125b6
3 changed files with 18 additions and 13 deletions
  1. 8
    3
      .classpath
  2. 1
    1
      build.moxie
  3. 9
    9
      gitblit.iml

+ 8
- 3
.classpath View File

@@ -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>

+ 1
- 1
build.moxie View File

@@ -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

+ 9
- 9
gitblit.iml View File

@@ -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>

Loading…
Cancel
Save