wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1189891 - Avoid including <cstring> from pkix/Input.h. r=bsmith

Browse Source
This commit is contained in:
Mike Hommey 2015-08-21 08:29:06 +09:00
parent ff92bbf244
commit 22a71eae08
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/pkix/include/pkix/Input.h
View File

@ -25,7 +25,7 @@
#ifndef mozilla_pkix_Input_h
#define mozilla_pkix_Input_h
#include <cstring>
#include <algorithm>
#include "pkix/Result.h"
#include "stdint.h"
@ -133,7 +133,7 @@ inline bool
InputsAreEqual(const Input& a, const Input& b)
{
return a.GetLength() == b.GetLength() &&
!std::memcmp(a.UnsafeGetData(), b.UnsafeGetData(), a.GetLength());
!std::equal(a.UnsafeGetData(), a.UnsafeGetData() + a.GetLength(), b.UnsafeGetData());
}
// An Reader is a cursor/iterator through the contents of an Input, designed to
@ -205,7 +205,7 @@ public:
if (static_cast<size_t>(end - input) != N) {
return false;
}
if (memcmp(input, toMatch, N)) {
if (std::equal(input, end, toMatch)) {
return false;
}
input = end;
@ -221,7 +221,7 @@ public:
if (toMatch.GetLength() != remaining) {
return false;
}
if (std::memcmp(input, toMatch.UnsafeGetData(), remaining)) {
if (std::equal(input, end, toMatch.UnsafeGetData())) {
return false;
}
input = end;

1
security/pkix/test/lib/pkixtestutil.h
View File

@ -28,6 +28,7 @@
#include <ctime>
#include <stdint.h> // Some Mozilla-supported compilers lack <cstdint>
#include <string>
#include <cstring>
#include "pkix/pkixtypes.h"
#include "../../lib/ScopedPtr.h"