diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-12-23 19:02:52 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-12-23 19:02:52 +0000 |
| commit | 029bcfe189eae5eebbaf58ccff4e1200dd78b228 (patch) | |
| tree | 1c226a334ea1a88e2d1c6f949c9320eb0c3bff59 /security/nss/lib/freebl/sha_fast.h | |
| parent | 149d2ffa779826cb48a381099858e76e4624d471 (diff) | |
| download | UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.gz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.lz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.xz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.zip | |
Issue #1693 - Update NSS to 3.59.1.1
This updates to MoonchildProductions/NSS@bd49b2b88 in the repo created for our
consumption of the library.
Diffstat (limited to 'security/nss/lib/freebl/sha_fast.h')
| -rw-r--r-- | security/nss/lib/freebl/sha_fast.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/security/nss/lib/freebl/sha_fast.h b/security/nss/lib/freebl/sha_fast.h index 1780ca8f4..c03c0637a 100644 --- a/security/nss/lib/freebl/sha_fast.h +++ b/security/nss/lib/freebl/sha_fast.h @@ -10,13 +10,19 @@ #define SHA1_INPUT_LEN 64 -#if defined(IS_64) && !defined(__sparc) +#if defined(IS_64) && !defined(__sparc) && !defined(__aarch64__) typedef PRUint64 SHA_HW_t; #define SHA1_USING_64_BIT 1 #else typedef PRUint32 SHA_HW_t; #endif +struct SHA1ContextStr; + +typedef void (*sha1_compress_t)(struct SHA1ContextStr *); +typedef void (*sha1_update_t)(struct SHA1ContextStr *, const unsigned char *, + unsigned int); + struct SHA1ContextStr { union { PRUint32 w[16]; /* input buffer */ @@ -24,6 +30,8 @@ struct SHA1ContextStr { } u; PRUint64 size; /* count of hashed bytes. */ SHA_HW_t H[22]; /* 5 state variables, 16 tmp values, 1 extra */ + sha1_compress_t compress; + sha1_update_t update; }; #if defined(_MSC_VER) @@ -135,7 +143,7 @@ swap4b(PRUint32 value) #define SHA_BYTESWAP(x) x = SHA_HTONL(x) -#define SHA_STORE(n) ((PRUint32*)hashout)[n] = SHA_HTONL(ctx->H[n]) +#define SHA_STORE(n) ((PRUint32 *)hashout)[n] = SHA_HTONL(ctx->H[n]) #if defined(HAVE_UNALIGNED_ACCESS) #define SHA_STORE_RESULT \ SHA_STORE(0); \ |