Skip to content

Convert non-BC ML-KEM keys in the legacy KEM code path #2466

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

Draft
WillChilds-Klein wants to merge 1 commit into
base: main
Choose a base branch
from
+90 −0
Draft

Convert non-BC ML-KEM keys in the legacy KEM code path #2466

Show file tree
Hide file tree
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
45 changes: 45 additions & 0 deletions tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/KemUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PrivateKey;
import java.security.Provider;
import java.security.PublicKey;
import java.security.spec.EncodedKeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;

import javax.crypto.KeyGenerator;
Expand All @@ -18,6 +21,7 @@
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jcajce.interfaces.MLKEMPrivateKey;
import org.bouncycastle.jcajce.interfaces.MLKEMPublicKey;
import org.bouncycastle.jcajce.spec.KEMExtractSpec;
import org.bouncycastle.jcajce.spec.KEMGenerateSpec;
Expand Down Expand Up @@ -54,6 +58,7 @@ static JceTlsSecret decapsulate(JcaTlsCrypto crypto, String kemName, PrivateKey
try
{
KeyGenerator keyGenerator = crypto.getHelper().createKeyGenerator(kemName);
privateKey = importPrivateKey(keyGenerator.getProvider(), kemName, privateKey);
keyGenerator.init(new KEMExtractSpec.Builder(privateKey, ciphertext, "DEF", 256).withNoKdf().build());
SecretKeyWithEncapsulation secEnc = (SecretKeyWithEncapsulation)keyGenerator.generateKey();
return crypto.adoptLocalSecret(secEnc.getEncoded());
Expand All @@ -69,6 +74,7 @@ static SecretKeyWithEncapsulation encapsulate(JcaTlsCrypto crypto, String kemNam
try
{
KeyGenerator keyGenerator = crypto.getHelper().createKeyGenerator(kemName);
publicKey = importPublicKey(keyGenerator.getProvider(), kemName, publicKey);
keyGenerator.init(new KEMGenerateSpec.Builder(publicKey, "DEF", 256).withNoKdf().build());
return (SecretKeyWithEncapsulation)keyGenerator.generateKey();
}
Expand Down Expand Up @@ -164,6 +170,45 @@ private static ASN1ObjectIdentifier getAlgorithmOID(String kemName)
throw new IllegalArgumentException("unknown kem name " + kemName);
}

/*
* The key objects and the KeyGenerator are resolved from the JCA independently, so a provider
* ahead of BC can supply keys that BC's generator will not accept. Re-import through the
* generator's own provider when that happens.
*/
private static PrivateKey importPrivateKey(Provider provider, String kemName, PrivateKey privateKey)
throws GeneralSecurityException
{
if (!(provider instanceof BouncyCastleProvider) || privateKey instanceof MLKEMPrivateKey)
{
return privateKey;
}

if (!"PKCS#8".equals(privateKey.getFormat()))
{
throw new InvalidKeyException("Private key format unrecognized: " + privateKey.getFormat());
}

KeyFactory kf = KeyFactory.getInstance(kemName, provider);
return kf.generatePrivate(new PKCS8EncodedKeySpec(privateKey.getEncoded()));
}

private static PublicKey importPublicKey(Provider provider, String kemName, PublicKey publicKey)
throws GeneralSecurityException
{
if (!(provider instanceof BouncyCastleProvider) || publicKey instanceof MLKEMPublicKey)
{
return publicKey;
}

if (!"X.509".equals(publicKey.getFormat()))
{
throw new InvalidKeyException("Public key format unrecognized: " + publicKey.getFormat());
}

KeyFactory kf = KeyFactory.getInstance(kemName, provider);
return kf.generatePublic(new X509EncodedKeySpec(publicKey.getEncoded()));
}

static boolean isKemSupported(JcaTlsCrypto crypto, String kemName)
{
if (kemName != null)
Expand Down
45 changes: 45 additions & 0 deletions tls/src/main/jdk17/org/bouncycastle/tls/crypto/impl/jcajce/KemUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PrivateKey;
import java.security.Provider;
import java.security.PublicKey;
import java.security.spec.EncodedKeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;

import javax.crypto.KeyGenerator;
Expand All @@ -18,6 +21,7 @@
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jcajce.interfaces.MLKEMPrivateKey;
import org.bouncycastle.jcajce.interfaces.MLKEMPublicKey;
import org.bouncycastle.jcajce.spec.KEMExtractSpec;
import org.bouncycastle.jcajce.spec.KEMGenerateSpec;
Expand Down Expand Up @@ -60,6 +64,7 @@ static JceTlsSecret decapsulate(JcaTlsCrypto crypto, String kemName, PrivateKey
try
{
KeyGenerator keyGenerator = crypto.getHelper().createKeyGenerator(kemName);
privateKey = importPrivateKey(keyGenerator.getProvider(), kemName, privateKey);
keyGenerator.init(new KEMExtractSpec.Builder(privateKey, ciphertext, "DEF", 256).withNoKdf().build());
SecretKeyWithEncapsulation secEnc = (SecretKeyWithEncapsulation)keyGenerator.generateKey();
return crypto.adoptLocalSecret(secEnc.getEncoded());
Expand All @@ -80,6 +85,7 @@ static SecretKeyWithEncapsulation encapsulate(JcaTlsCrypto crypto, String kemNam
try
{
KeyGenerator keyGenerator = crypto.getHelper().createKeyGenerator(kemName);
publicKey = importPublicKey(keyGenerator.getProvider(), kemName, publicKey);
keyGenerator.init(new KEMGenerateSpec.Builder(publicKey, "DEF", 256).withNoKdf().build());
return (SecretKeyWithEncapsulation)keyGenerator.generateKey();
}
Expand Down Expand Up @@ -180,6 +186,45 @@ private static ASN1ObjectIdentifier getAlgorithmOID(String kemName)
throw new IllegalArgumentException("unknown kem name " + kemName);
}

/*
* The key objects and the KeyGenerator are resolved from the JCA independently, so a provider
* ahead of BC can supply keys that BC's generator will not accept. Re-import through the
* generator's own provider when that happens.
*/
private static PrivateKey importPrivateKey(Provider provider, String kemName, PrivateKey privateKey)
throws GeneralSecurityException
{
if (!(provider instanceof BouncyCastleProvider) || privateKey instanceof MLKEMPrivateKey)
{
return privateKey;
}

if (!"PKCS#8".equals(privateKey.getFormat()))
{
throw new InvalidKeyException("Private key format unrecognized: " + privateKey.getFormat());
}

KeyFactory kf = KeyFactory.getInstance(kemName, provider);
return kf.generatePrivate(new PKCS8EncodedKeySpec(privateKey.getEncoded()));
}

private static PublicKey importPublicKey(Provider provider, String kemName, PublicKey publicKey)
throws GeneralSecurityException
{
if (!(provider instanceof BouncyCastleProvider) || publicKey instanceof MLKEMPublicKey)
{
return publicKey;
}

if (!"X.509".equals(publicKey.getFormat()))
{
throw new InvalidKeyException("Public key format unrecognized: " + publicKey.getFormat());
}

KeyFactory kf = KeyFactory.getInstance(kemName, provider);
return kf.generatePublic(new X509EncodedKeySpec(publicKey.getEncoded()));
}

static boolean isKemSupported(JcaTlsCrypto crypto, String kemName)
{
if (SpiUtil.hasKEM())
Expand Down