9 files changed, 17 insertions, 17 deletions
diff --git a/third_party/boringssl/LICENSE b/third_party/boringssl/LICENSE
index 49c41fa7af..e9667cb9c2 100644
--- a/third_party/boringssl/LICENSE
+++ b/third_party/boringssl/LICENSE
@@ -142,7 +142,7 @@ record keeping.)
 
 ISC license used for completely new code in BoringSSL:
 
-/* Copyright (c) 2015, Google Inc.
+/* Copyright 2015 Google LLC
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -200,7 +200,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
+   * Neither the name of Google LLC nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -222,7 +222,7 @@ trybots etc. The scripts which manage this, and the script for generating build
 metadata, are under the Chromium license. Distributing code linked against
 BoringSSL does not trigger this license.
 
-Copyright 2015 The Chromium Authors. All rights reserved.
+Copyright 2015 The Chromium Authors
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -234,7 +234,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
+   * Neither the name of Google LLC nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/third_party/boringssl/common/aes-gcm.c b/third_party/boringssl/common/aes-gcm.c
index edb98b88b3..8fe5f75307 100644
--- a/third_party/boringssl/common/aes-gcm.c
+++ b/third_party/boringssl/common/aes-gcm.c
@@ -48,7 +48,6 @@
 
 #include "aes-gcm.h"
 #include "common.h"
-#include "endian.h"
 #include "util.h"
 
 #define STRICT_ALIGNMENT 1
diff --git a/third_party/boringssl/common/curve25519-generic.c b/third_party/boringssl/common/curve25519-generic.c
index e0d09b2acb..16e0668071 100644
--- a/third_party/boringssl/common/curve25519-generic.c
+++ b/third_party/boringssl/common/curve25519-generic.c
@@ -1,4 +1,4 @@
-/* Copyright 2015, Google Inc.
+/* Copyright 2015 Google LLC
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/third_party/boringssl/common/curve25519.c b/third_party/boringssl/common/curve25519.c
index 2a7fad6509..1c902e424c 100644
--- a/third_party/boringssl/common/curve25519.c
+++ b/third_party/boringssl/common/curve25519.c
@@ -1,4 +1,4 @@
-/* Copyright 2015, Google Inc.
+/* Copyright 2015 Google LLC
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,7 +27,7 @@
 
 #ifdef CONFIG_RNG
 void X25519_keypair(uint8_t out_public_value[32], uint8_t out_private_key[32]) {
-  rand_bytes(out_private_key, 32);
+  trng_rand_bytes(out_private_key, 32);
 
   /* All X25519 implementations should decode scalars correctly (see
    * https://tools.ietf.org/html/rfc7748#section-5). However, if an
diff --git a/third_party/boringssl/include/aes-gcm.h b/third_party/boringssl/include/aes-gcm.h
index e3ef457224..77ca52a3ed 100644
--- a/third_party/boringssl/include/aes-gcm.h
+++ b/third_party/boringssl/include/aes-gcm.h
@@ -50,7 +50,6 @@
 #define __CROS_EC_AES_GCM_H
 
 #include "common.h"
-#include "endian.h"
 #include "util.h"
 
 // block128_f is the type of a 128-bit, block cipher.
diff --git a/third_party/boringssl/include/curve25519.h b/third_party/boringssl/include/curve25519.h
index 8287c94466..05cebeed99 100644
--- a/third_party/boringssl/include/curve25519.h
+++ b/third_party/boringssl/include/curve25519.h
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/third_party/boringssl/test/x25519.c b/third_party/boringssl/test/x25519.c
index dac8795b63..cd773653e5 100644
--- a/third_party/boringssl/test/x25519.c
+++ b/third_party/boringssl/test/x25519.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, Google Inc.
+/* Copyright 2015 Google LLC
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -180,7 +180,7 @@ static void test_x25519_speed(void)
 	ccprintf("X25519 duration %lld us\n", (long long)(t1.val - t0.val));
 }
 
-void run_test(int argc, char **argv)
+void run_test(int argc, const char **argv)
 {
 	watchdog_reload();
 	/* do not check speed, just as a benchmark */
diff --git a/third_party/rules.mk b/third_party/rules.mk
index 16fd1e52e3..eb4391b70c 100644
--- a/third_party/rules.mk
+++ b/third_party/rules.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # vim: set filetype=make :
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2020 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
@@ -13,7 +13,7 @@ ifeq ($(CONFIG_LIBCRYPTOC),y)
 
 # The cryptoc path can be overridden on invocation, as in the following example:
 # $ make CRYPTOC_DIR=~/src/cryptoc BOARD=bloonchipper
-CRYPTOC_DIR ?= $(realpath ../../third_party/cryptoc)
+CRYPTOC_DIR ?= ../../third_party/cryptoc
 
 # SUPPORT_UNALIGNED indicates to libcryptoc that provided data buffers
 # may be unaligned and please handle them safely.
@@ -22,9 +22,6 @@ cmd_libcryptoc = $(MAKE) -C $(CRYPTOC_DIR) \
 	SUPPORT_UNALIGNED=1
 cmd_libcryptoc_clean = $(cmd_libcryptoc) -q && echo clean
 
-ifneq ($(BOARD),host)
-CPPFLAGS += -I$(abspath ./builtin)
-endif
 CPPFLAGS += -I$(CRYPTOC_DIR)/include
 CRYPTOC_LDFLAGS := -L$(out)/cryptoc -lcryptoc
 
@@ -36,6 +33,10 @@ CRYPTOC_LDFLAGS := -L$(out)/cryptoc -lcryptoc
 ifneq ($(shell $(cmd_libcryptoc_clean)),clean)
 .PHONY: $(out)/cryptoc/libcryptoc.a
 endif
+# Rewrite the CFLAGS include paths to be absolute, since cryptoc is built
+# using a different working directory. This is only relevant because
+# cryptoc makes use of stdlibs, which EC provides from the builtin/ directory.
+$(out)/cryptoc/libcryptoc.a: CFLAGS := $(patsubst -I%,-I$(abspath %),$(CFLAGS))
 $(out)/cryptoc/libcryptoc.a:
 	+$(call quiet,libcryptoc,MAKE   )
 
diff --git a/third_party/sha2/sha256.c b/third_party/sha2/sha256.c
index 2d6eaa43f2..475092b1fd 100644
--- a/third_party/sha2/sha256.c
+++ b/third_party/sha2/sha256.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  */
 
+#include "builtin/assert.h"
 #include "sha256.h"
 #include "util.h"