motiejus
/
jgit
1
Fork 0
Code Releases Activity

[gpg] Update to Bouncy Castle 1.69 

Bump lower bound in MANIFEST.MF and adapt code.

Change-Id: I3a3c7948e5fc29f5517fe84209fcea81834e8e5b
This commit is contained in:
Thomas Wolf 2021-07-26 13:28:40 +02:00
parent 2d73c702d3
commit f1e67911ed
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
View File

@ -8,27 +8,27 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-Version: 5.13.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)",
org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)",
org.bouncycastle.asn1.x9;version="[1.65.0,2.0.0)",
org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
org.bouncycastle.bcpg.sig;version="[1.65.0,2.0.0)",
org.bouncycastle.crypto.ec;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg.keybox;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)",
org.bouncycastle.jcajce.interfaces;version="[1.65.0,2.0.0)",
org.bouncycastle.jcajce.util;version="[1.65.0,2.0.0)",
org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)",
org.bouncycastle.math.ec;version="[1.65.0,2.0.0)",
org.bouncycastle.math.field;version="[1.65.0,2.0.0)",
org.bouncycastle.openpgp;version="[1.65.0,2.0.0)",
org.bouncycastle.openpgp.jcajce;version="[1.65.0,2.0.0)",
org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
org.bouncycastle.util;version="[1.65.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
org.bouncycastle.util.io;version="[1.65.0,2.0.0)",
Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)",
org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)",
org.bouncycastle.bcpg;version="[1.69.0,2.0.0)",
org.bouncycastle.bcpg.sig;version="[1.69.0,2.0.0)",
org.bouncycastle.crypto.ec;version="[1.69.0,2.0.0)",
org.bouncycastle.gpg;version="[1.69.0,2.0.0)",
org.bouncycastle.gpg.keybox;version="[1.69.0,2.0.0)",
org.bouncycastle.gpg.keybox.jcajce;version="[1.69.0,2.0.0)",
org.bouncycastle.jcajce.interfaces;version="[1.69.0,2.0.0)",
org.bouncycastle.jcajce.util;version="[1.69.0,2.0.0)",
org.bouncycastle.jce.provider;version="[1.69.0,2.0.0)",
org.bouncycastle.math.ec;version="[1.69.0,2.0.0)",
org.bouncycastle.math.field;version="[1.69.0,2.0.0)",
org.bouncycastle.openpgp;version="[1.69.0,2.0.0)",
org.bouncycastle.openpgp.jcajce;version="[1.69.0,2.0.0)",
org.bouncycastle.openpgp.operator;version="[1.69.0,2.0.0)",
org.bouncycastle.openpgp.operator.jcajce;version="[1.69.0,2.0.0)",
org.bouncycastle.util;version="[1.69.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)",
org.bouncycastle.util.io;version="[1.69.0,2.0.0)",
org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
org.slf4j;version="[1.7.0,2.0.0)"

2
org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java
View File

@ -195,7 +195,7 @@ public void signObject(@NonNull ObjectBuilder object,
}
}
if (userId != null) {
subpackets.setSignerUserID(false, userId);
subpackets.addSignerUserID(false, userId);
}
signatureGenerator
.setHashedSubpackets(subpackets.generate());