Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Removed

### Fixed
- Fix the native plugin installation error cause by the pgp public key change ([#18147](https://github.com/opensearch-project/OpenSearch/pull/18147))

### Security

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.lucene.util.CollectionUtil;
import org.apache.lucene.util.Constants;
import org.bouncycastle.bcpg.ArmoredInputStream;
import org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKey;
import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
Expand Down Expand Up @@ -90,6 +91,7 @@
import java.nio.file.attribute.PosixFilePermissions;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.Security;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -632,6 +634,7 @@ void verifySignature(final Path zip, final String urlString) throws IOException,
// compute the signature of the downloaded plugin zip
final PGPPublicKeyRingCollection collection = new PGPPublicKeyRingCollection(ain, new JcaKeyFingerprintCalculator());
final PGPPublicKey key = collection.getPublicKey(signature.getKeyID());
Security.addProvider(new BouncyCastleFipsProvider());
signature.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BCFIPS"), key);
final byte[] buffer = new byte[1024];
int read;
Expand Down
109 changes: 61 additions & 48 deletions distribution/tools/plugin-cli/src/main/resources/public_key.sig
Original file line number Diff line number Diff line change
@@ -1,51 +1,64 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

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
=4bMD
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
1AW1
=/lVB
-----END PGP PUBLIC KEY BLOCK-----
Loading