From 5e881e8ea9f3d420a58fa7802c604649c9766eb2 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Tue, 9 Feb 2021 12:19:35 +0000 Subject: [PATCH] Bump CMake minimum, pare down config.h --- CMakeLists.txt | 4 +--- include/mbedtls/mbedtls_config.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6debe35d1..66f3fe5f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,7 @@ # mbedtls, mbedx509, mbedcrypto and apidoc targets. # -# We specify a minimum requirement of 3.10.2, but for now use 3.5.1 here -# until our infrastructure catches up. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.13) include(CMakePackageConfigHelpers) diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index 0558ee001..59dbeede8 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -1265,7 +1265,7 @@ * * Enable the checkup functions (*_self_test). */ -#define MBEDTLS_SELF_TEST +//#define MBEDTLS_SELF_TEST /** * \def MBEDTLS_SHA256_SMALLER @@ -2440,7 +2440,7 @@ * * This module provides networking routines. */ -#define MBEDTLS_NET_C +//#define MBEDTLS_NET_C /** * \def MBEDTLS_OID_C