mirrors
/
jgit
mirror of https://github.com/eclipse/jgit.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 204 Wiki Activity
Browse Source

Upgrade Bouncy Castle to 1.61 

Also now use JcaKeyBoxBuilder constructor in
BouncyCastleGpgKeyLocator.readKeyBoxFile(Path).

CQ: 19868
CQ: 19869
CQ: 19870
Change-Id: I45bd80e158aecd90448b0c7e59615db27aaef892
Signed-off-by: Brandon Weeks <bweeks@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v5.4.0.201906121030-r
Brandon Weeks 5 years ago
parent
fc40a173d6
commit
f4443ef3f9
14 changed files with 109 additions and 100 deletions
Split View Show Diff Stats
  1. 7
    7
      WORKSPACE
  2. 8
    8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
  3. 8
    8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
  4. 12
    15
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12-staging.target
  5. 8
    8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
  6. 8
    8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
  7. 8
    8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
  8. 8
    8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
  9. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20190531194818-2019-06.tpd
  10. 1
    1
      org.eclipse.jgit.test/META-INF/MANIFEST.MF
  11. 11
    10
      org.eclipse.jgit/META-INF/MANIFEST.MF
  12. 15
    9
      org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java
  13. 8
    3
      org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgSigner.java
  14. 1
    1
      pom.xml

+ 7
- 7
WORKSPACE View File

@@ -212,25 +212,25 @@ maven_jar(
src_sha1 = "94e89a8c9f82e38555e95b9f7f58344a247e862c",
)

BOUNCYCASTLE_VER = "1.60"
BOUNCYCASTLE_VER = "1.61"

maven_jar(
name = "bcpg",
artifact = "org.bouncycastle:bcpg-jdk15on:" + BOUNCYCASTLE_VER,
sha1 = "13c7a199c484127daad298996e95818478431a2c",
src_sha1 = "edcd9e86d95e39b4da39bb295efd93bc4f56266e",
sha1 = "422656435514ab8a28752b117d5d2646660a0ace",
src_sha1 = "836da34e11114cbce8fa99f54175f8f3278d1cce",
)

maven_jar(
name = "bcprov",
artifact = "org.bouncycastle:bcprov-jdk15on:" + BOUNCYCASTLE_VER,
sha1 = "bd47ad3bd14b8e82595c7adaa143501e60842a84",
src_sha1 = "7c57a4d13fe53d9abb967bba600dd0b293dafd6a",
sha1 = "00df4b474e71be02c1349c3292d98886f888d1f7",
src_sha1 = "3bf88046a16098ea6cc41576dd50d512854d39e1",
)

maven_jar(
name = "bcpkix",
artifact = "org.bouncycastle:bcpkix-jdk15on:" + BOUNCYCASTLE_VER,
sha1 = "d0c46320fbc07be3a24eb13a56cee4e3d38e0c75",
src_sha1 = "a25f041293f401af08efba63ff4bbdce98134a03",
sha1 = "89bb3aa5b98b48e584eee2a7401b7682a46779b4",
src_sha1 = "a0498d09200a18737eccc05aa81bbd05c1be0f8c",
)

+ 8
- 8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.10" sequenceNumber="1559343380">
<target name="jgit-4.10" sequenceNumber="1559344693">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
@@ -37,12 +37,12 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190530-2038"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -82,7 +82,7 @@
<unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 8
- 8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.11" sequenceNumber="1559343397">
<target name="jgit-4.11" sequenceNumber="1559344703">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
@@ -37,12 +37,12 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190530-2038"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -82,7 +82,7 @@
<unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 12
- 15
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12-staging.target View File

@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.12-staging" sequenceNumber="1559343402">
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde?><!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="jgit-4.12-staging" sequenceNumber="1559344709">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
@@ -22,7 +19,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
<repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
<unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
@@ -37,12 +34,12 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190530-2038"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -82,11 +79,11 @@
<unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
<repository location="http://download.eclipse.org/staging/2019-06/"/>
</location>
</locations>
</target>
</target>

+ 8
- 8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.6" sequenceNumber="1559343406">
<target name="jgit-4.6" sequenceNumber="1559344729">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
@@ -37,12 +37,12 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190530-2038"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -82,7 +82,7 @@
<unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 8
- 8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.7" sequenceNumber="1559343410">
<target name="jgit-4.7" sequenceNumber="1559344742">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
@@ -37,12 +37,12 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190530-2038"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -82,7 +82,7 @@
<unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 8
- 8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.8" sequenceNumber="1559343414">
<target name="jgit-4.8" sequenceNumber="1559344743">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
@@ -37,12 +37,12 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190530-2038"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -82,7 +82,7 @@
<unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 8
- 8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.9" sequenceNumber="1559343418">
<target name="jgit-4.9" sequenceNumber="1559344747">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
@@ -37,12 +37,12 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.bouncycastle.bcpg" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190530-2038"/>
<unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190530-2038"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -82,7 +82,7 @@
<unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
<unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190531194818/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20190531194818-2019-06.tpd View File

@@ -16,12 +16,12 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R201905311948
org.apache.httpcomponents.httpcore.source [4.4.10.v20190123-2214,4.4.10.v20190123-2214]
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
org.bouncycastle.bcpg [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
org.bouncycastle.bcpg.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
org.bouncycastle.bcpkix [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
org.bouncycastle.bcpkix.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
org.bouncycastle.bcprov [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
org.bouncycastle.bcprov.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
org.bouncycastle.bcpg [1.61.0.v20190530-2038,1.61.0.v20190530-2038]
org.bouncycastle.bcpg.source [1.61.0.v20190530-2038,1.61.0.v20190530-2038]
org.bouncycastle.bcpkix [1.61.0.v20190530-2038,1.61.0.v20190530-2038]
org.bouncycastle.bcpkix.source [1.61.0.v20190530-2038,1.61.0.v20190530-2038]
org.bouncycastle.bcprov [1.61.0.v20190530-2038,1.61.0.v20190530-2038]
org.bouncycastle.bcprov.source [1.61.0.v20190530-2038,1.61.0.v20190530-2038]
org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000]

+ 1
- 1
org.eclipse.jgit.test/META-INF/MANIFEST.MF View File

@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
com.jcraft.jsch;version="[0.1.54,0.2.0)",
net.bytebuddy.dynamic.loading;version="[1.7.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.60.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.61.0,2.0.0)",
org.eclipse.jgit.annotations;version="[5.4.0,5.5.0)",
org.eclipse.jgit.api;version="[5.4.0,5.5.0)",
org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",

+ 11
- 10
org.eclipse.jgit/META-INF/MANIFEST.MF View File

@@ -160,16 +160,17 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
com.jcraft.jsch;version="[0.1.37,0.2.0)",
javax.crypto,
javax.net.ssl,
org.bouncycastle;version="[1.60.0,2.0.0)",
org.bouncycastle.bcpg;version="[1.60.0,2.0.0)",
org.bouncycastle.gpg;version="[1.60.0,2.0.0)",
org.bouncycastle.gpg.keybox;version="[1.60.0,2.0.0)",
org.bouncycastle.jce.provider;version="[1.60.0,2.0.0)",
org.bouncycastle.openpgp;version="[1.60.0,2.0.0)",
org.bouncycastle.openpgp.jcajce;version="[1.60.0,2.0.0)",
org.bouncycastle.openpgp.operator;version="[1.60.0,2.0.0)",
org.bouncycastle.openpgp.operator.jcajce;version="[1.60.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.60.0,2.0.0)",
org.bouncycastle;version="[1.61.0,2.0.0)",
org.bouncycastle.bcpg;version="[1.61.0,2.0.0)",
org.bouncycastle.gpg;version="[1.61.0,2.0.0)",
org.bouncycastle.gpg.keybox;version="[1.61.0,2.0.0)",
org.bouncycastle.gpg.keybox.jcajce;version="[1.61.0,2.0.0)",
org.bouncycastle.jce.provider;version="[1.61.0,2.0.0)",
org.bouncycastle.openpgp;version="[1.61.0,2.0.0)",
org.bouncycastle.openpgp.jcajce;version="[1.61.0,2.0.0)",
org.bouncycastle.openpgp.operator;version="[1.61.0,2.0.0)",
org.bouncycastle.openpgp.operator.jcajce;version="[1.61.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.61.0,2.0.0)",
org.slf4j;version="[1.7.0,2.0.0)",
org.xml.sax,
org.xml.sax.helpers

+ 15
- 9
org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java View File

@@ -54,6 +54,8 @@ import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.text.MessageFormat;
import java.util.Iterator;
import java.util.Locale;
@@ -67,6 +69,7 @@ import org.bouncycastle.gpg.keybox.KeyBox;
import org.bouncycastle.gpg.keybox.KeyInformation;
import org.bouncycastle.gpg.keybox.PublicKeyRingBlob;
import org.bouncycastle.gpg.keybox.UserID;
import org.bouncycastle.gpg.keybox.jcajce.JcaKeyBoxBuilder;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKey;
import org.bouncycastle.openpgp.PGPSecretKey;
@@ -210,9 +213,12 @@ class BouncyCastleGpgKeyLocator {
* @return publicKey the public key (maybe <code>null</code>)
* @throws IOException
* in case of problems reading the file
* @throws NoSuchAlgorithmException
* @throws NoSuchProviderException
*/
private PGPPublicKey findPublicKeyInKeyBox(Path keyboxFile)
throws IOException {
throws IOException, NoSuchAlgorithmException,
NoSuchProviderException {
KeyBox keyBox = readKeyBoxFile(keyboxFile);
for (KeyBlob keyBlob : keyBox.getKeyBlobs()) {
if (keyBlob.getType() == BlobType.OPEN_PGP_BLOB) {
@@ -236,15 +242,17 @@ class BouncyCastleGpgKeyLocator {
* @return the secret key
* @throws IOException
* in case of issues reading key files
* @throws NoSuchAlgorithmException
* @throws NoSuchProviderException
* @throws PGPException
* in case of issues finding a key
* @throws CanceledException
* @throws URISyntaxException
* @throws UnsupportedCredentialItem
*/
public BouncyCastleGpgKey findSecretKey()
throws IOException, PGPException, CanceledException,
UnsupportedCredentialItem, URISyntaxException {
public BouncyCastleGpgKey findSecretKey() throws IOException,
NoSuchAlgorithmException, NoSuchProviderException, PGPException,
CanceledException, UnsupportedCredentialItem, URISyntaxException {
if (exists(USER_KEYBOX_PATH)) {
PGPPublicKey publicKey = //
findPublicKeyInKeyBox(USER_KEYBOX_PATH);
@@ -376,14 +384,12 @@ class BouncyCastleGpgKeyLocator {
.getPublicKey();
}

private KeyBox readKeyBoxFile(Path keyboxFile) throws IOException {
private KeyBox readKeyBoxFile(Path keyboxFile) throws IOException,
NoSuchAlgorithmException, NoSuchProviderException {
KeyBox keyBox;
try (InputStream in = new BufferedInputStream(
newInputStream(keyboxFile))) {
// note: KeyBox constructor reads in the whole InputStream at once
// this code will change in 1.61 to
// either 'new BcKeyBox(in)' or 'new JcaKeyBoxBuilder().build(in)'
keyBox = new KeyBox(in, new JcaKeyFingerprintCalculator());
keyBox = new JcaKeyBoxBuilder().build(in);
}
return keyBox;
}

+ 8
- 3
org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgSigner.java View File

@@ -45,6 +45,8 @@ package org.eclipse.jgit.lib.internal;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URISyntaxException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Security;

import org.bouncycastle.bcpg.ArmoredOutputStream;
@@ -100,7 +102,8 @@ public class BouncyCastleGpgSigner extends GpgSigner {
BouncyCastleGpgKey gpgKey = locateSigningKey(gpgSigningKey,
committer, passphrasePrompt);
return gpgKey != null;
} catch (PGPException | IOException | URISyntaxException e) {
} catch (PGPException | IOException | NoSuchAlgorithmException
| NoSuchProviderException | URISyntaxException e) {
return false;
}
}
@@ -109,7 +112,8 @@ public class BouncyCastleGpgSigner extends GpgSigner {
PersonIdent committer,
BouncyCastleGpgKeyPassphrasePrompt passphrasePrompt)
throws CanceledException, UnsupportedCredentialItem, IOException,
PGPException, URISyntaxException {
NoSuchAlgorithmException, NoSuchProviderException, PGPException,
URISyntaxException {
if (gpgSigningKey == null || gpgSigningKey.isEmpty()) {
gpgSigningKey = committer.getEmailAddress();
}
@@ -153,7 +157,8 @@ public class BouncyCastleGpgSigner extends GpgSigner {
signatureGenerator.generate().encode(out);
}
commit.setGpgSignature(new GpgSignature(buffer.toByteArray()));
} catch (PGPException | IOException | URISyntaxException e) {
} catch (PGPException | IOException | NoSuchAlgorithmException
| NoSuchProviderException | URISyntaxException e) {
throw new JGitInternalException(e.getMessage(), e);
}
}

+ 1
- 1
pom.xml View File

@@ -202,7 +202,7 @@
<maven-javadoc-plugin-version>3.1.0</maven-javadoc-plugin-version>
<tycho-extras-version>1.3.0</tycho-extras-version>
<gson-version>2.8.2</gson-version>
<bouncycastle-version>1.60</bouncycastle-version>
<bouncycastle-version>1.61</bouncycastle-version>
<spotbugs-maven-plugin-version>3.1.11</spotbugs-maven-plugin-version>
<maven-surefire-version>2.22.2</maven-surefire-version>
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>

Write Preview
Loading…
Cancel
Save