Bug 1571316 - Fix undefined PORT_Assert reference in ARMv7 make builds r=jcj
authorKevin Jacobs <kjacobs@mozilla.com>
Tue, 06 Aug 2019 22:31:44 +0000
changeset 15245 e7dd3cdb8c0b7eb229acf12929dfe9a8006f29c0
parent 15244 54d7aee231cc83431a415666c75bd16d54a74c34
child 15246 89aa19677e37b98e7725ccf491940c6cbb042296
push id3457
push userjjones@mozilla.com
push dateTue, 06 Aug 2019 22:32:20 +0000
reviewersjcj
bugs1571316
Bug 1571316 - Fix undefined PORT_Assert reference in ARMv7 make builds r=jcj The recent x25519 update added some assertions in `curve25519_32.c`. For these, we need to include a new header file in order to support Makefile builds on armv7. Differential Revision: https://phabricator.services.mozilla.com/D40752
lib/freebl/ecl/curve25519_32.c
--- a/lib/freebl/ecl/curve25519_32.c
+++ b/lib/freebl/ecl/curve25519_32.c
@@ -24,16 +24,20 @@
  * Derived from machine-generated code via Fiat-Crypto:
  * https://github.com/mit-plv/fiat-crypto and https://github.com/briansmith/ring
  *
  * The below captures notable changes:
  *
  *  1. Convert custom integer types to stdint.h types
  */
 
+#ifdef FREEBL_NO_DEPEND
+#include "../stubs.h"
+#endif
+
 #include "ecl-priv.h"
 
 /* fe means field element. Here the field is \Z/(2^255-19). An element t,
  * entries t[0]...t[9], represents the integer t[0]+2^26 t[1]+2^51 t[2]+2^77
  * t[3]+2^102 t[4]+...+2^230 t[9].
  * fe limbs are bounded by 1.125*2^26,1.125*2^25,1.125*2^26,1.125*2^25,etc.
  * Multiplication and carrying produce fe from fe_loose.
  */