diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-26 13:28:40 +0200 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-26 13:30:37 +0200 |
| commit | f1e67911edce630830c7941074a016d184253dab (patch) | |
| tree | 742180500b56186e3a2e1bf46e16c0101ae7ba96 | |
| parent | 2d73c702d3e9128b7dc03a01fe2cf18f119d3ffe (diff) | |
| download | jgit-f1e67911edce630830c7941074a016d184253dab.tar.gz jgit-f1e67911edce630830c7941074a016d184253dab.zip | |
[gpg] Update to Bouncy Castle 1.69
Bump lower bound in MANIFEST.MF and adapt code.
Change-Id: I3a3c7948e5fc29f5517fe84209fcea81834e8e5b
| -rw-r--r-- | org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 42 | ||||
| -rw-r--r-- | org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java | 2 |
2 files changed, 22 insertions, 22 deletions
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 2d306aa1ea..c766fe15c0 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -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)" diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java index 211bd7bd20..763b7f7526 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java @@ -195,7 +195,7 @@ public class BouncyCastleGpgSigner extends GpgSigner } } if (userId != null) { - subpackets.setSignerUserID(false, userId); + subpackets.addSignerUserID(false, userId); } signatureGenerator .setHashedSubpackets(subpackets.generate()); |