wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-01 12:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

partly imported from tenfourfox: #578: M1579060 M1586176

Browse source
This commit is contained in:
Roy Tam 2019-12-10 10:53:09 +08:00
commit 91821d6b92
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
security/pkix/lib/pkixcert.cpp
View file

@ -105,29 +105,24 @@ BackCert::Init()
return rv; return rv;
} }
static const uint8_t CSC = der::CONTEXT_SPECIFIC | der::CONSTRUCTED;
// According to RFC 5280, all fields below this line are forbidden for // According to RFC 5280, all fields below this line are forbidden for
// certificate versions less than v3. However, for compatibility reasons, // certificate versions less than v3. However, for compatibility reasons,
// we parse v1/v2 certificates in the same way as v3 certificates. So if // we parse v1/v2 certificates in the same way as v3 certificates. So if
// these fields appear in a v1 certificate, they will be used. // these fields appear in a v1 certificate, they will be used.
// Ignore issuerUniqueID if present. // Ignore issuerUniqueID if present.
if (tbsCertificate.Peek(CSC | 1)) { rv = der::SkipOptionalImplicitPrimitiveTag(tbsCertificate, 1);
rv = der::ExpectTagAndSkipValue(tbsCertificate, CSC | 1); if (rv != Success) {
if (rv != Success) { return rv;
return rv;
}
} }
// Ignore subjectUniqueID if present. // Ignore subjectUniqueID if present.
if (tbsCertificate.Peek(CSC | 2)) { rv = der::SkipOptionalImplicitPrimitiveTag(tbsCertificate, 2);
rv = der::ExpectTagAndSkipValue(tbsCertificate, CSC | 2); if (rv != Success) {
if (rv != Success) { return rv;
return rv;
}
} }
static const uint8_t CSC = der::CONTEXT_SPECIFIC | der::CONSTRUCTED;
rv = der::OptionalExtensions( rv = der::OptionalExtensions(
tbsCertificate, CSC | 3, tbsCertificate, CSC | 3,
[this](Reader& extnID, const Input& extnValue, bool critical, [this](Reader& extnID, const Input& extnValue, bool critical,

11
security/pkix/lib/pkixder.h
View file

@ -123,6 +123,17 @@ ExpectTagAndSkipValue(Reader& input, uint8_t tag)
return ExpectTagAndGetValue(input, tag, ignoredValue); return ExpectTagAndGetValue(input, tag, ignoredValue);
} }
// This skips IMPLICIT OPTIONAL tags that are "primitive" (not constructed),
// given the number in the class of the tag (i.e. the number in the brackets in
// `issuerUniqueID [1] IMPLICIT UniqueIdentifier OPTIONAL`).
inline Result SkipOptionalImplicitPrimitiveTag(Reader& input,
uint8_t numberInClass) {
if (input.Peek(CONTEXT_SPECIFIC | numberInClass)) {
return ExpectTagAndSkipValue(input, CONTEXT_SPECIFIC | numberInClass);
}
return Success;
}
// Like ExpectTagAndGetValue, except the output Input will contain the // Like ExpectTagAndGetValue, except the output Input will contain the
// encoded tag and length along with the value. // encoded tag and length along with the value.
inline Result inline Result