Skip to content

Commit

Permalink
repaired mbedTLS config
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilu committed Feb 1, 2024
1 parent a148e09 commit 85a47d9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
29 changes: 19 additions & 10 deletions 3rdparty/mbedtls-2.28.7/include/mbedtls/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,19 @@
*/
/*
* Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, 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 MBEDTLS_CONFIG_H
Expand Down Expand Up @@ -44,7 +56,7 @@
*
* Comment to disable the use of assembly code.
*/
#define MBEDTLS_HAVE_ASM
// #define MBEDTLS_HAVE_ASM

/**
* \def MBEDTLS_NO_UDBL_DIVISION
Expand Down Expand Up @@ -627,7 +639,7 @@
*
* Uncomment to use your own hardware entropy collector.
*/
//#define MBEDTLS_ENTROPY_HARDWARE_ALT
#define MBEDTLS_ENTROPY_HARDWARE_ALT

/**
* \def MBEDTLS_AES_ROM_TABLES
Expand Down Expand Up @@ -851,9 +863,6 @@
* contexts and therefore is a compatibility break for applications that access
* fields of a mbedtls_ecdh_context structure directly. See also
* MBEDTLS_ECDH_LEGACY_CONTEXT in include/mbedtls/ecdh.h.
*
* The Everest code is provided under the Apache 2.0 license only; therefore enabling this
* option is not compatible with taking the library under the GPL v2.0-or-later license.
*/
//#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED

Expand Down Expand Up @@ -1348,7 +1357,7 @@
*
* Uncomment this macro to disable the built-in platform entropy functions.
*/
//#define MBEDTLS_NO_PLATFORM_ENTROPY
#define MBEDTLS_NO_PLATFORM_ENTROPY

/**
* \def MBEDTLS_ENTROPY_FORCE_SHA256
Expand Down Expand Up @@ -2459,7 +2468,7 @@
*
* This modules adds support for the AES-NI instructions on x86.
*/
#define MBEDTLS_AESNI_C
// #define MBEDTLS_AESNI_C

/**
* \def MBEDTLS_AES_C
Expand Down Expand Up @@ -3024,7 +3033,7 @@
*
* Uncomment to enable the HAVEGE random generator.
*/
//#define MBEDTLS_HAVEGE_C
#define MBEDTLS_HAVEGE_C

/**
* \def MBEDTLS_HKDF_C
Expand Down Expand Up @@ -3206,7 +3215,7 @@
*
* This modules adds support for the VIA PadLock on x86.
*/
#define MBEDTLS_PADLOCK_C
// #define MBEDTLS_PADLOCK_C

/**
* \def MBEDTLS_PEM_PARSE_C
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Version 1.12.1 (The puny port) / February 2nd, 2024
* repaired mbedTLS config

# Version 1.12.0 (The puny port) / February 2nd, 2024
* Updated `Zip` to 0.3.1
* Updated to mbedTLS 2.28.7
Expand Down

0 comments on commit 85a47d9

Please sign in to comment.