| Index: base/third_party/nss/sha512.cc
|
| diff --git a/base/third_party/nss/sha512.cc b/base/third_party/nss/sha512.cc
|
| index 6ad064556c378885911dffdb0c1f2d167e7715fc..e582174a9043022d2daed41d87a3b82c4fc9ab6e 100644
|
| --- a/base/third_party/nss/sha512.cc
|
| +++ b/base/third_party/nss/sha512.cc
|
| @@ -42,16 +42,18 @@
|
| // size from ~10k to ~1k. The performance should be reasonable for our use.
|
| #define NOUNROLL256 1
|
|
|
| +#include "base/third_party/nspr/prcpucfg_mac.h"
|
| #include "base/third_party/nspr/prtypes.h" /* for PRUintXX */
|
| +#include "base/third_party/nss/blapit.h"
|
| #if defined(_X86_) || defined(SHA_NO_LONG_LONG)
|
| #define NOUNROLL512 1
|
| #undef HAVE_LONG_LONG
|
| #endif
|
| -#include "base/third_party/nss/blapi.h"
|
| -#include "base/third_party/nss/sha256.h" /* for struct SHA256ContextStr */
|
| -
|
| #include <stdlib.h>
|
| #include <string.h>
|
| +
|
| +#include "base/third_party/nss/sha256.h" /* for struct SHA256ContextStr */
|
| +
|
| #define PORT_New(type) static_cast<type*>(malloc(sizeof(type)))
|
| #define PORT_ZFree(ptr, len) do { memset(ptr, 0, len); free(ptr); } while (0)
|
| #define PORT_Strlen(s) static_cast<unsigned int>(strlen(s))
|
| @@ -131,6 +133,7 @@ swap4b(PRUint32 dwd)
|
| #undef __pentium__
|
| #define __pentium__ 1
|
| #include <byteswap.h>
|
| +
|
| #define SHA_HTONL(x) bswap_32(x)
|
| #define BYTESWAP4(x) x = SHA_HTONL(x)
|
|
|
|
|