Skip to content

Make KEM abstract methods protected to allow external subclassing #2290

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

Open
jmcrawford45 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −14
Open

Make KEM abstract methods protected to allow external subclassing #2290

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
2 changes: 1 addition & 1 deletion core/src/main/java/org/bouncycastle/crypto/hpke/DHKEM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public AsymmetricCipherKeyPair DeserializePrivateKey(byte[] skEncoded, byte[] pk
}
}

int getEncryptionSize()
protected int getEncryptionSize()
{
return Nenc;
}
Expand Down
26 changes: 13 additions & 13 deletions core/src/main/java/org/bouncycastle/crypto/hpke/KEM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@
public abstract class KEM
{
// Key Generation
abstract AsymmetricCipherKeyPair GeneratePrivateKey();
abstract AsymmetricCipherKeyPair DeriveKeyPair(byte[] ikm);
protected abstract AsymmetricCipherKeyPair GeneratePrivateKey();
protected abstract AsymmetricCipherKeyPair DeriveKeyPair(byte[] ikm);

// Encapsulates a shared secret for a given public key and returns the encapsulated key and shared secret.
abstract byte[][] Encap(AsymmetricKeyParameter recipientPublicKey);
abstract byte[][] Encap(AsymmetricKeyParameter pkR, AsymmetricCipherKeyPair kpE);
abstract byte[][] AuthEncap(AsymmetricKeyParameter pkR, AsymmetricCipherKeyPair kpS);
protected abstract byte[][] Encap(AsymmetricKeyParameter recipientPublicKey);
protected abstract byte[][] Encap(AsymmetricKeyParameter pkR, AsymmetricCipherKeyPair kpE);
protected abstract byte[][] AuthEncap(AsymmetricKeyParameter pkR, AsymmetricCipherKeyPair kpS);

// Decapsulates the given encapsulated key using the recipient's key pair and returns the shared secret.
abstract byte[] Decap(byte[] encapsulatedKey, AsymmetricCipherKeyPair recipientKeyPair);
abstract byte[] AuthDecap(byte[] enc, AsymmetricCipherKeyPair kpR, AsymmetricKeyParameter pkS);
protected abstract byte[] Decap(byte[] encapsulatedKey, AsymmetricCipherKeyPair recipientKeyPair);
protected abstract byte[] AuthDecap(byte[] enc, AsymmetricCipherKeyPair kpR, AsymmetricKeyParameter pkS);

// Serialization
abstract byte[] SerializePublicKey(AsymmetricKeyParameter publicKey);
abstract byte[] SerializePrivateKey(AsymmetricKeyParameter key);
protected abstract byte[] SerializePublicKey(AsymmetricKeyParameter publicKey);
protected abstract byte[] SerializePrivateKey(AsymmetricKeyParameter key);

// Deserialization
abstract AsymmetricKeyParameter DeserializePublicKey(byte[] encodedPublicKey);
abstract AsymmetricCipherKeyPair DeserializePrivateKey(byte[] skEncoded, byte[] pkEncoded);
protected abstract AsymmetricKeyParameter DeserializePublicKey(byte[] encodedPublicKey);
protected abstract AsymmetricCipherKeyPair DeserializePrivateKey(byte[] skEncoded, byte[] pkEncoded);

abstract int getEncryptionSize();
protected abstract int getEncryptionSize();

}
}