Merge BoringSSL 5b280a8: Move curve25519 code to third_party/fiat.

LICENSE

@@ -30,7 +30,8 @@ Contributors to BoringSSL are required to follow the CLA rules for Chromium:
 https://cla.developers.google.com/clas
 
 Some files from Intel are under yet another license, which is also included
-underneath.
+underneath. Files in third_party/ have their own licenses, as described
+therein.
 
 The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the
 OpenSSL License and the original SSLeay license apply to the toolkit. See below

build.rs

@@ -68,7 +68,6 @@ const RING_SRCS: &'static [(&'static [&'static str], &'static str)] = &[
     (&[], "crypto/fipsmodule/cipher/e_aes.c"),
     (&[NEVER], "crypto/cipher_extra/e_aesgcmsiv.c"),
     (&[], "crypto/crypto.c"),
-    (&[], "crypto/curve25519/curve25519.c"),
     (&[], "crypto/fipsmodule/ec/ecp_nistz.c"),
     (&[], "crypto/fipsmodule/ec/ecp_nistz256.c"),
     (&[], "crypto/fipsmodule/ec/gfp_p256.c"),
@@ -77,6 +76,7 @@ const RING_SRCS: &'static [(&'static [&'static str], &'static str)] = &[
     (&[], "crypto/mem.c"),
     (&[], "crypto/fipsmodule/modes/gcm.c"),
     (&[NEVER], "crypto/fipsmodule/modes/polyval.c"),
+    (&[], "third_party/fiat/curve25519.c"),
 
     (&[X86_64, X86], "crypto/cpu-intel.c"),
 
@@ -148,7 +148,6 @@ const RING_INCLUDES: &'static [&'static str] =
     &["crypto/fipsmodule/aes/internal.h",
       "crypto/fipsmodule/bn/internal.h",
       "crypto/fipsmodule/cipher/internal.h",
-      "crypto/curve25519/internal.h",
       "crypto/fipsmodule/ec/ecp_nistz256_table.inl",
       "crypto/fipsmodule/ec/ecp_nistz384.inl",
       "crypto/fipsmodule/ec/ecp_nistz.h",
@@ -164,7 +163,9 @@ const RING_INCLUDES: &'static [&'static str] =
       "include/GFp/bn.h",
       "include/GFp/cpu.h",
       "include/GFp/mem.h",
-      "include/GFp/type_check.h"];
+      "include/GFp/type_check.h",
+      "third_party/fiat/internal.h",
+    ];
 
 #[cfg_attr(rustfmt, rustfmt_skip)]
 const RING_PERL_INCLUDES: &'static [&'static str] =

crypto/curve25519/x25519-x86_64.c

@@ -21,7 +21,8 @@
 
 #include <string.h>
 
-#include "internal.h"
+#include "../internal.h"
+#include "../../third_party/fiat/internal.h"
 
 
 #if defined(BORINGSSL_X25519_X86_64)

third_party/fiat/CMakeLists.txt

@@ -0,0 +1,9 @@
+include_directories(../../include)
+
+add_library(
+  fiat
+
+  OBJECT
+
+  curve25519.c
+)

third_party/fiat/curve25519.c

@@ -24,9 +24,8 @@
 #include <GFp/cpu.h>
 #include <GFp/mem.h>
 
-#include "../internal.h"
-
 #include "internal.h"
+#include "../../crypto/internal.h"
 
 #if defined(_MSC_VER)
 // '=': conversion from 'int64_t' to 'int32_t', possible loss of data