28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
diff -ru jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/pom.xml jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/pom.xml
|
|
--- jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/pom.xml 2021-09-08 20:27:06.000000000 +0800
|
|
+++ jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/pom.xml 2023-06-06 11:11:02.594321250 +0800
|
|
@@ -51,11 +51,6 @@
|
|
|
|
<dependency>
|
|
<groupId>org.bouncycastle</groupId>
|
|
- <artifactId>bcutil-jdk15on</artifactId>
|
|
- </dependency>
|
|
-
|
|
- <dependency>
|
|
- <groupId>org.bouncycastle</groupId>
|
|
<artifactId>bcpkix-jdk15on</artifactId>
|
|
</dependency>
|
|
|
|
diff -ru jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java
|
|
--- jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java 2021-09-08 20:27:06.000000000 +0800
|
|
+++ jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java 2023-06-06 17:14:42.614321250 +0800
|
|
@@ -195,7 +195,7 @@
|
|
}
|
|
}
|
|
if (userId != null) {
|
|
- subpackets.addSignerUserID(false, userId);
|
|
+ subpackets.setSignerUserID(false, userId);
|
|
}
|
|
signatureGenerator
|
|
.setHashedSubpackets(subpackets.generate());
|