Skip to content

fix: consume subject public key wrappers #71

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
leopoldjoy wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: consume subject public key wrappers #71

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
8 changes: 8 additions & 0 deletions src/CertManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,14 @@ contract CertManager is ICertManager {
Asn1Ptr subjectPublicKeyPtr = certificate.nextSiblingOf(pubKeyAlgoPtr);
Asn1Ptr subjectPubKeyPtr = certificate.bitstring(subjectPublicKeyPtr);

if (
algoParamsPtr.header() + algoParamsPtr.totalLength() != pubKeyAlgoPtr.header() + pubKeyAlgoPtr.totalLength()
|| subjectPublicKeyPtr.header() + subjectPublicKeyPtr.totalLength()
!= subjectPublicKeyInfoPtr.header() + subjectPublicKeyInfoPtr.totalLength()
) {
revert InvalidSubjectPublicKey();
}

if (certificate.keccak(pubKeyAlgoIdPtr.content(), pubKeyAlgoIdPtr.length()) != EC_PUB_KEY_OID) {
revert InvalidSubjectPublicKey();
}
Expand Down
21 changes: 21 additions & 0 deletions test/CertManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,27 @@ contract CertManagerTest is Test {
assertEq(certManagerPubKeyHarness.parsePubKey(spki), pubKey);
}

function test_ParsePubKeyRejectsTrailingAlgorithmIdentifierFields() public {
bytes memory pubKey = _patternBytes(96);
bytes memory algorithmIdentifier =
_derNode(0x30, bytes.concat(hex"06072a8648ce3d0201", hex"06052b81040022", hex"0500"));
bytes memory subjectPublicKey = _derNode(0x03, bytes.concat(hex"0004", pubKey));
bytes memory spki = _derNode(0x30, bytes.concat(algorithmIdentifier, subjectPublicKey));

vm.expectRevert(CertManager.InvalidSubjectPublicKey.selector);
certManagerPubKeyHarness.parsePubKey(spki);
}

function test_ParsePubKeyRejectsTrailingSubjectPublicKeyInfoFields() public {
bytes memory pubKey = _patternBytes(96);
bytes memory algorithmIdentifier = _derNode(0x30, hex"06072a8648ce3d020106052b81040022");
bytes memory subjectPublicKey = _derNode(0x03, bytes.concat(hex"0004", pubKey));
bytes memory spki = _derNode(0x30, bytes.concat(algorithmIdentifier, subjectPublicKey, hex"0500"));

vm.expectRevert(CertManager.InvalidSubjectPublicKey.selector);
certManagerPubKeyHarness.parsePubKey(spki);
}

function test_ParsePubKeyRejectsCompressedP384Point() public {
bytes memory compressedKey = _patternBytes(48);
bytes memory spki = abi.encodePacked(hex"3046301006072a8648ce3d020106052b8104002203320002", compressedKey);
Expand Down
Loading