Skip to content

Test PGPSignatures with LegacyEd25519 keys with short MPIs #1706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vanitasvitae wants to merge 1 commit into from
Closed

Test PGPSignatures with LegacyEd25519 keys with short MPIs #1706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion pg/src/test/java/org/bouncycastle/openpgp/test/PGPSignatureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,22 @@
import java.util.Date;
import java.util.Iterator;

import org.bouncycastle.bcpg.*;
import org.bouncycastle.bcpg.ArmoredInputStream;
import org.bouncycastle.bcpg.BCPGInputStream;
import org.bouncycastle.bcpg.CompressionAlgorithmTags;
import org.bouncycastle.bcpg.HashAlgorithmTags;
import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
import org.bouncycastle.bcpg.SignatureSubpacket;
import org.bouncycastle.bcpg.SignatureSubpacketInputStream;
import org.bouncycastle.bcpg.SignatureSubpacketTags;
import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
import org.bouncycastle.bcpg.sig.IntendedRecipientFingerprint;
import org.bouncycastle.bcpg.sig.IssuerFingerprint;
import org.bouncycastle.bcpg.sig.KeyFlags;
import org.bouncycastle.bcpg.sig.NotationData;
import org.bouncycastle.bcpg.sig.SignatureTarget;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.math.ec.rfc8032.Ed25519;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPLiteralData;
import org.bouncycastle.openpgp.PGPLiteralDataGenerator;
Expand Down Expand Up @@ -759,6 +768,7 @@ public void performTest()
testUserAttributeEncoding();
testExportNonExportableSignature();
testRejectionOfIllegalSignatureType0xFF();
testGetSignatureOfLegacyEd25519KeyWithShortMPIs();
}

private void testUserAttributeEncoding()
Expand Down Expand Up @@ -1413,6 +1423,17 @@ private void testRejectionOfIllegalSignatureType0xFF()
}
}

private void testGetSignatureOfLegacyEd25519KeyWithShortMPIs()
throws PGPException, IOException
{
String ed25519KeyWithShortSignatureMPIs = "88740401160a00270502666a2d4009105ac5b83f1a5ad687162104229cfc85fe0ca2e3718b022c5ac5b83f1a5ad6870000a16b00f7754c1d14b068ae5e6816c376367569b1ae984587e8e5ec3cc54b811549a4920100ca2159e5965bf7d8655385449994aead14ccf05c3f33335b98d305c0f20ef50e";
ByteArrayInputStream bIn = new ByteArrayInputStream(Hex.decode(ed25519KeyWithShortSignatureMPIs));
BCPGInputStream pIn = new BCPGInputStream(bIn);
PGPSignature signature = new PGPSignature(pIn);
isEquals("Short MPIs in LegacyEd25519 signature MUST be properly parsed",
Ed25519.SIGNATURE_SIZE, signature.getSignature().length);
}

private PGPSignatureList readSignatures(String armored)
throws IOException
{
Expand Down