mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-26 02:45:44 +01:00
Add some corrections based on code review
-Add the DHM_ALT in an alphabetical order -Close correctly the 'extern "C" { ...'
This commit is contained in:
parent
08ba530bff
commit
d569ecfc2c
@ -267,6 +267,7 @@
|
|||||||
//#define MBEDTLS_BLOWFISH_ALT
|
//#define MBEDTLS_BLOWFISH_ALT
|
||||||
//#define MBEDTLS_CAMELLIA_ALT
|
//#define MBEDTLS_CAMELLIA_ALT
|
||||||
//#define MBEDTLS_DES_ALT
|
//#define MBEDTLS_DES_ALT
|
||||||
|
//#define MBEDTLS_DHM_ALT
|
||||||
//#define MBEDTLS_XTEA_ALT
|
//#define MBEDTLS_XTEA_ALT
|
||||||
//#define MBEDTLS_MD2_ALT
|
//#define MBEDTLS_MD2_ALT
|
||||||
//#define MBEDTLS_MD4_ALT
|
//#define MBEDTLS_MD4_ALT
|
||||||
@ -275,7 +276,7 @@
|
|||||||
//#define MBEDTLS_SHA1_ALT
|
//#define MBEDTLS_SHA1_ALT
|
||||||
//#define MBEDTLS_SHA256_ALT
|
//#define MBEDTLS_SHA256_ALT
|
||||||
//#define MBEDTLS_SHA512_ALT
|
//#define MBEDTLS_SHA512_ALT
|
||||||
//#define MBEDTLS_DHM_ALT
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* When replacing the elliptic curve module, pleace consider, that it is
|
* When replacing the elliptic curve module, pleace consider, that it is
|
||||||
|
@ -296,10 +296,19 @@ int mbedtls_dhm_parse_dhm( mbedtls_dhm_context *dhm, const unsigned char *dhmin,
|
|||||||
int mbedtls_dhm_parse_dhmfile( mbedtls_dhm_context *dhm, const char *path );
|
int mbedtls_dhm_parse_dhmfile( mbedtls_dhm_context *dhm, const char *path );
|
||||||
#endif /* MBEDTLS_FS_IO */
|
#endif /* MBEDTLS_FS_IO */
|
||||||
#endif /* MBEDTLS_ASN1_PARSE_C */
|
#endif /* MBEDTLS_ASN1_PARSE_C */
|
||||||
#else
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else /* MBEDTLS_DHM_ALT */
|
||||||
#include "dhm_alt.h"
|
#include "dhm_alt.h"
|
||||||
#endif /* MBEDTLS_DHM_ALT */
|
#endif /* MBEDTLS_DHM_ALT */
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Checkup routine
|
* \brief Checkup routine
|
||||||
*
|
*
|
||||||
|
@ -99,6 +99,9 @@ static const char *features[] = {
|
|||||||
#if defined(MBEDTLS_DES_ALT)
|
#if defined(MBEDTLS_DES_ALT)
|
||||||
"MBEDTLS_DES_ALT",
|
"MBEDTLS_DES_ALT",
|
||||||
#endif /* MBEDTLS_DES_ALT */
|
#endif /* MBEDTLS_DES_ALT */
|
||||||
|
#if defined(MBEDTLS_DHM_ALT)
|
||||||
|
"MBEDTLS_DHM_ALT",
|
||||||
|
#endif /* MBEDTLS_DHM_ALT */
|
||||||
#if defined(MBEDTLS_XTEA_ALT)
|
#if defined(MBEDTLS_XTEA_ALT)
|
||||||
"MBEDTLS_XTEA_ALT",
|
"MBEDTLS_XTEA_ALT",
|
||||||
#endif /* MBEDTLS_XTEA_ALT */
|
#endif /* MBEDTLS_XTEA_ALT */
|
||||||
@ -123,9 +126,6 @@ static const char *features[] = {
|
|||||||
#if defined(MBEDTLS_SHA512_ALT)
|
#if defined(MBEDTLS_SHA512_ALT)
|
||||||
"MBEDTLS_SHA512_ALT",
|
"MBEDTLS_SHA512_ALT",
|
||||||
#endif /* MBEDTLS_SHA512_ALT */
|
#endif /* MBEDTLS_SHA512_ALT */
|
||||||
#if defined(MBEDTLS_DHM_ALT)
|
|
||||||
"MBEDTLS_DHM_ALT",
|
|
||||||
#endif /* MBEDTLS_DHM_ALT */
|
|
||||||
#if defined(MBEDTLS_ECP_ALT)
|
#if defined(MBEDTLS_ECP_ALT)
|
||||||
"MBEDTLS_ECP_ALT",
|
"MBEDTLS_ECP_ALT",
|
||||||
#endif /* MBEDTLS_ECP_ALT */
|
#endif /* MBEDTLS_ECP_ALT */
|
||||||
|
Loading…
Reference in New Issue
Block a user