Bug 1432177, land NSS_3_36_RTM, r=franziskus

UPGRADE_NSS_RELEASE

security/nss/TAG-INFO

@@ -1 +1 @@
-NSS_3_36_BETA3
+NSS_3_36_RTM

security/nss/automation/taskcluster/docker-hacl/Dockerfile

@@ -5,11 +5,11 @@ MAINTAINER Franziskus Kiefer <franziskuskiefer@gmail.com>
 # the original F* formula with Daniel Fabian
 
 # Pinned versions of HACL* (F* and KreMLin are pinned as submodules)
-ENV haclrepo https://github.com/mitls/hacl-star.git
+ENV haclrepo https://github.com/franziskuskiefer/hacl-star.git
 
 # Define versions of dependencies
 ENV opamv 4.04.2
-ENV haclversion 104de0fbc83939a5e76012d64e3db2b3c0524bd1
+ENV haclversion 668d6cf274c33bbe2e951e3a84b73f2b6442a51f
 
 # Install required packages and set versions
 ADD setup.sh /tmp/setup.sh

security/nss/coreconf/coreconf.dep

@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+

security/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c

@@ -224,19 +224,6 @@ Hacl_Impl_Chacha20_Vec128_update_last(uint8_t *output, uint8_t *plain, uint32_t
     }
 }
 
-static void
-Hacl_Impl_Chacha20_Vec128_store_4_vec(uint8_t *output, vec v0, vec v1, vec v2, vec v3)
-{
-    uint8_t *o0 = output;
-    uint8_t *o1 = output + (uint32_t)16U;
-    uint8_t *o2 = output + (uint32_t)32U;
-    uint8_t *o3 = output + (uint32_t)48U;
-    vec_store_le(o0, v0);
-    vec_store_le(o1, v1);
-    vec_store_le(o2, v2);
-    vec_store_le(o3, v3);
-}
-
 static void
 Hacl_Impl_Chacha20_Vec128_xor_block(uint8_t *output, uint8_t *plain, vec *st)
 {
@@ -248,11 +235,18 @@ Hacl_Impl_Chacha20_Vec128_xor_block(uint8_t *output, uint8_t *plain, vec *st)
     vec k1 = st[1U];
     vec k2 = st[2U];
     vec k3 = st[3U];
-    vec o0 = vec_xor(p0, k0);
-    vec o1 = vec_xor(p1, k1);
-    vec o2 = vec_xor(p2, k2);
-    vec o3 = vec_xor(p3, k3);
-    Hacl_Impl_Chacha20_Vec128_store_4_vec(output, o0, o1, o2, o3);
+    vec o00 = vec_xor(p0, k0);
+    vec o10 = vec_xor(p1, k1);
+    vec o20 = vec_xor(p2, k2);
+    vec o30 = vec_xor(p3, k3);
+    uint8_t *o0 = output;
+    uint8_t *o1 = output + (uint32_t)16U;
+    uint8_t *o2 = output + (uint32_t)32U;
+    uint8_t *o3 = output + (uint32_t)48U;
+    vec_store_le(o0, o00);
+    vec_store_le(o1, o10);
+    vec_store_le(o2, o20);
+    vec_store_le(o3, o30);
 }
 
 static void

security/nss/lib/freebl/verified/kremlib_base.h

@@ -17,6 +17,7 @@
 #define __KREMLIB_BASE_H
 
 #include <inttypes.h>
+#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

security/nss/lib/nss/nss.h

@@ -22,12 +22,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.36" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.36" _NSS_CUSTOMIZED
 #define NSS_VMAJOR 3
 #define NSS_VMINOR 36
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
-#define NSS_BETA PR_TRUE
+#define NSS_BETA PR_FALSE
 
 #ifndef RC_INVOKED
 

security/nss/lib/softoken/softkver.h

@@ -17,11 +17,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.36" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.36" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR 3
 #define SOFTOKEN_VMINOR 36
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
-#define SOFTOKEN_BETA PR_TRUE
+#define SOFTOKEN_BETA PR_FALSE
 
 #endif /* _SOFTKVER_H_ */

security/nss/lib/util/nssutil.h

@@ -19,12 +19,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.36 Beta"
+#define NSSUTIL_VERSION "3.36"
 #define NSSUTIL_VMAJOR 3
 #define NSSUTIL_VMINOR 36
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_TRUE
+#define NSSUTIL_BETA PR_FALSE
 
 SEC_BEGIN_PROTOS