diff options
| author | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-03-09 14:13:50 +0000 |
|---|---|---|
| committer | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-03-09 14:13:50 +0000 |
| commit | 0dd68eb4000e1db1cc9e66a0d14e628ffb84f2bd (patch) | |
| tree | dd949b5b94f5ec0ed1d4a98b787bcfbd06d038ad | |
| parent | 4f498e35564433b4fdb94591b31db5b06196f2f1 (diff) | |
| download | nss-hg-0dd68eb4000e1db1cc9e66a0d14e628ffb84f2bd.tar.gz | |
Bug 1612493 - Fix Firefox build for Windows 2012 x64. r=kjacobs
Differential Revision: https://phabricator.services.mozilla.com/D65945
| -rwxr-xr-x | automation/taskcluster/scripts/run_hacl.sh | 2 | ||||
| -rw-r--r-- | lib/freebl/verified/Hacl_Poly1305_128.c | 4 | ||||
| -rw-r--r-- | lib/freebl/verified/Hacl_Poly1305_256.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/automation/taskcluster/scripts/run_hacl.sh b/automation/taskcluster/scripts/run_hacl.sh index 4ad6ca7f1..a7099480c 100755 --- a/automation/taskcluster/scripts/run_hacl.sh +++ b/automation/taskcluster/scripts/run_hacl.sh @@ -13,7 +13,7 @@ set -e -x -v # HACL CI. # When bug 1593647 is resolved, extract the code on CI again. git clone -q "https://github.com/project-everest/hacl-star" ~/hacl-star -git -C ~/hacl-star checkout -q 4faa2f0e26b544c81e5d2e0af773cc8008863470 +git -C ~/hacl-star checkout -q 079854e0072041d60859b6d8af2743bc6a37dc05 # Format the C snapshot. cd ~/hacl-star/dist/mozilla diff --git a/lib/freebl/verified/Hacl_Poly1305_128.c b/lib/freebl/verified/Hacl_Poly1305_128.c index e6293ba3e..8fea2949e 100644 --- a/lib/freebl/verified/Hacl_Poly1305_128.c +++ b/lib/freebl/verified/Hacl_Poly1305_128.c @@ -23,7 +23,7 @@ #include "Hacl_Poly1305_128.h" -inline void +void Hacl_Impl_Poly1305_Field32xN_128_load_acc2(Lib_IntVector_Intrinsics_vec128 *acc, uint8_t *b) { Lib_IntVector_Intrinsics_vec128 e[5U]; @@ -108,7 +108,7 @@ Hacl_Impl_Poly1305_Field32xN_128_load_acc2(Lib_IntVector_Intrinsics_vec128 *acc, acc[4U] = acc41; } -inline void +void Hacl_Impl_Poly1305_Field32xN_128_fmul_r2_normalize( Lib_IntVector_Intrinsics_vec128 *out, Lib_IntVector_Intrinsics_vec128 *p) diff --git a/lib/freebl/verified/Hacl_Poly1305_256.c b/lib/freebl/verified/Hacl_Poly1305_256.c index afe9a4f46..66a927648 100644 --- a/lib/freebl/verified/Hacl_Poly1305_256.c +++ b/lib/freebl/verified/Hacl_Poly1305_256.c @@ -23,7 +23,7 @@ #include "Hacl_Poly1305_256.h" -inline void +void Hacl_Impl_Poly1305_Field32xN_256_load_acc4(Lib_IntVector_Intrinsics_vec256 *acc, uint8_t *b) { Lib_IntVector_Intrinsics_vec256 e[5U]; @@ -127,7 +127,7 @@ Hacl_Impl_Poly1305_Field32xN_256_load_acc4(Lib_IntVector_Intrinsics_vec256 *acc, acc[4U] = acc41; } -inline void +void Hacl_Impl_Poly1305_Field32xN_256_fmul_r4_normalize( Lib_IntVector_Intrinsics_vec256 *out, Lib_IntVector_Intrinsics_vec256 *p) |