From ca32503ee219aa17f225f4daa1ae8a5434bef22a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@espressif.com>
Date: Wed, 6 Sep 2017 15:06:57 +1000
Subject: [PATCH] mbedtls: Re-apply MBEDTLS_BIGNUM_ALT & related macros for
 custom bignum functions

(IDF-specific patch.)

(cherry picked from commit f859b9bc7579246703446c158270ae038442351c)
---
 include/mbedtls/bignum.h |  5 +++++
 library/bignum.c         | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/include/mbedtls/bignum.h b/include/mbedtls/bignum.h
index 71d7b97672..9d050d7c05 100644
--- a/include/mbedtls/bignum.h
+++ b/include/mbedtls/bignum.h
@@ -99,6 +99,8 @@
                                                   MBEDTLS_LN_2_DIV_LN_10_SCALE100 - 1) / \
                                                  MBEDTLS_LN_2_DIV_LN_10_SCALE100) + 10 + 6)
 
+#if !defined(MBEDTLS_BIGNUM_ALT)
+
 /*
  * Define the base integer type, architecture-wise.
  *
@@ -1065,6 +1067,9 @@ typedef enum {
 int mbedtls_mpi_gen_prime(mbedtls_mpi *X, size_t nbits, int flags,
                           int (*f_rng)(void *, unsigned char *, size_t),
                           void *p_rng);
+#else /* MBEDTLS_BIGNUM_ALT */
+#include "bignum_alt.h"
+#endif /* MBEDTLS_BIGNUM_ALT */
 
 #if defined(MBEDTLS_SELF_TEST)
 
diff --git a/library/bignum.c b/library/bignum.c
index c45fd5bf24..2c92afd150 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -37,7 +37,7 @@
 
 #include "mbedtls/platform.h"
 
-
+#if !defined(MBEDTLS_BIGNUM_ALT)
 
 /*
  * Conditionally select an MPI sign in constant time.
@@ -1186,6 +1186,7 @@ int mbedtls_mpi_sub_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b
     return mbedtls_mpi_sub_mpi(X, A, &B);
 }
 
+#if !defined(MBEDTLS_MPI_MUL_MPI_ALT)
 /*
  * Baseline multiplication: X = A * B  (HAC 14.12)
  */
@@ -1281,6 +1282,7 @@ int mbedtls_mpi_mul_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b
 cleanup:
     return ret;
 }
+#endif
 
 /*
  * Unsigned integer divide - double mbedtls_mpi_uint dividend, u1/u0, and
@@ -1610,6 +1612,11 @@ int mbedtls_mpi_mod_int(mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_s
     return 0;
 }
 
+#if !defined(MBEDTLS_MPI_EXP_MOD_ALT)
+
+/*
+ * Sliding-window exponentiation: X = A^E mod N  (HAC 14.85)
+ */
 int mbedtls_mpi_exp_mod(mbedtls_mpi *X, const mbedtls_mpi *A,
                         const mbedtls_mpi *E, const mbedtls_mpi *N,
                         mbedtls_mpi *prec_RR)
@@ -1719,6 +1726,7 @@ cleanup:
 
     return ret;
 }
+#endif
 
 /*
  * Greatest common divisor: G = gcd(A, B)  (HAC 14.54)
@@ -2275,6 +2283,7 @@ cleanup:
 }
 
 #endif /* MBEDTLS_GENPRIME */
+#endif /* MBEDTLS_BIGNUM_ALT */
 
 #if defined(MBEDTLS_SELF_TEST)