Skip to content

Commit

Permalink
wpa_supplicant: Allow building with mbedTLS integration but no hardwa…
Browse files Browse the repository at this point in the history
…re MPI

Also disable the relevant function in bignum.h based on config, so fails at
compile not link time.

Closes #5321
  • Loading branch information
projectgus committed May 20, 2020
1 parent 437a8fa commit 0927ec0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions components/mbedtls/port/include/mbedtls/bignum.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,10 +11,10 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef __ESP_MBEDTLS_BIGNUM_H__
#define __ESP_MBEDTLS_BIGNUM_H__
#pragma once

#include_next "mbedtls/bignum.h"
#include "sdkconfig.h"

/**
* This is a wrapper for the main mbedtls/bignum.h. This wrapper
Expand Down Expand Up @@ -58,6 +58,8 @@ void esp_mpi_acquire_hardware(void);
*/
void esp_mpi_release_hardware(void);

#if CONFIG_MBEDTLS_HARDWARE_MPI

/* @brief MPI modular mupltiplication function
*
* Calculates Z = (X * Y) mod M using MPI hardware acceleration.
Expand All @@ -75,4 +77,4 @@ void esp_mpi_release_hardware(void);
*/
int esp_mpi_mul_mpi_mod(mbedtls_mpi *Z, const mbedtls_mpi *X, const mbedtls_mpi *Y, const mbedtls_mpi *M);

#endif
#endif // CONFIG_MBEDTLS_HARDWARE_MPI
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ int crypto_bignum_mulmod(const struct crypto_bignum *a,
struct crypto_bignum *d)
{
int res;
#if ALLOW_EVEN_MOD // Must enable this macro if c is even.
#if ALLOW_EVEN_MOD || !CONFIG_MBEDTLS_HARDWARE_MPI // Must enable ALLOW_EVEN_MOD if c is even
mbedtls_mpi temp;
mbedtls_mpi_init(&temp);

Expand Down

0 comments on commit 0927ec0

Please sign in to comment.