Skip to content

refactor: scope certificate parser temporaries #75

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
+9 −5
Draft

refactor: scope certificate parser temporaries #75

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
14 changes: 9 additions & 5 deletions src/CertManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,16 +373,20 @@ contract CertManager is ICertManager {
returns (uint64 notAfter, int64 maxPathLen, bytes32 issuerHash, bytes32 subjectHash, bytes memory pubKey)
{
_requireAsn1Tag(certificate, ptr, 0x30);
Asn1Ptr versionPtr = certificate.firstChildOf(ptr);
_requireAsn1Tag(certificate, versionPtr, 0xa0);
Asn1Ptr sigAlgoPtr = certificate.nextSiblingOf(certificate.nextSiblingOf(versionPtr));
Asn1Ptr sigAlgoPtr;
{
Asn1Ptr versionPtr = certificate.firstChildOf(ptr);
_requireAsn1Tag(certificate, versionPtr, 0xa0);
sigAlgoPtr = certificate.nextSiblingOf(certificate.nextSiblingOf(versionPtr));

// as extensions are used in cert, version should be 3 (value 2) as per https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.1
if (certificate.uintAt(certificate.firstChildOf(versionPtr)) != 2) revert InvalidCertVersion();
}
_requireAsn1Tag(certificate, sigAlgoPtr, 0x30);

if (certificate.keccak(sigAlgoPtr.content(), sigAlgoPtr.length()) != CERT_ALGO_OID) {
revert InvalidCertAlgorithm();
}
// as extensions are used in cert, version should be 3 (value 2) as per https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.1
if (certificate.uintAt(certificate.firstChildOf(versionPtr)) != 2) revert InvalidCertVersion();

(notAfter, maxPathLen, issuerHash, subjectHash, pubKey) =
_parseTbsInner(certificate, sigAlgoPtr, ca, ptr.content() + ptr.length());
Expand Down
Loading