Backed out changeset 982be1bbebdf (bug 1199624) for Windows bustage.

This commit is contained in:
Ryan VanderMeulen 2015-08-30 17:09:09 -04:00
parent 5a61810c25
commit 3325ea8059
2 changed files with 4 additions and 3 deletions

View File

@ -487,7 +487,8 @@ CertPolicyId::IsAnyPolicy() const {
return true;
}
return numBytes == sizeof(::mozilla::pkix::anyPolicy) &&
std::equal(bytes, bytes + numBytes, ::mozilla::pkix::anyPolicy);
!memcmp(bytes, ::mozilla::pkix::anyPolicy,
sizeof(::mozilla::pkix::anyPolicy));
}
// certificatePolicies ::= SEQUENCE SIZE (1..MAX) OF PolicyInformation

View File

@ -1700,8 +1700,8 @@ FinishIPv6Address(/*in/out*/ uint8_t (&address)[16], int numComponents,
address + (2u * static_cast<size_t>(contractionIndex)),
componentsToMove * 2u);
// Fill in the contracted area with zeros.
std::fill_n(address + 2u * static_cast<size_t>(contractionIndex),
8u - static_cast<size_t>(numComponents) * 2u, 0u);
memset(address + (2u * static_cast<size_t>(contractionIndex)), 0u,
(8u - static_cast<size_t>(numComponents)) * 2u);
return true;
}