forked from wolfSSL/wolfssl
Improvements for portability using older gcc 4.8.2 and customer parsing tools.
This commit is contained in:
@@ -466,7 +466,7 @@ typedef struct wc_CryptoInfo {
|
|||||||
} wc_CryptoInfo;
|
} wc_CryptoInfo;
|
||||||
|
|
||||||
|
|
||||||
typedef int (*CryptoDevCallbackFunc)(int devId, wc_CryptoInfo* info, void* ctx);
|
typedef int (*CryptoDevCallbackFunc)(int devId, struct wc_CryptoInfo* info, void* ctx);
|
||||||
|
|
||||||
WOLFSSL_LOCAL void wc_CryptoCb_Init(void);
|
WOLFSSL_LOCAL void wc_CryptoCb_Init(void);
|
||||||
WOLFSSL_LOCAL void wc_CryptoCb_Cleanup(void);
|
WOLFSSL_LOCAL void wc_CryptoCb_Cleanup(void);
|
||||||
|
@@ -215,7 +215,7 @@ enum {
|
|||||||
#if defined(HAVE_ECC) || defined(HAVE_CURVE25519) || \
|
#if defined(HAVE_ECC) || defined(HAVE_CURVE25519) || \
|
||||||
defined(HAVE_CURVE448) || defined(WOLFCRYPT_HAVE_SAKKE)
|
defined(HAVE_CURVE448) || defined(WOLFCRYPT_HAVE_SAKKE)
|
||||||
/* Curve Types */
|
/* Curve Types */
|
||||||
typedef enum ecc_curve_id {
|
enum ecc_curve_ids {
|
||||||
ECC_CURVE_INVALID = -1,
|
ECC_CURVE_INVALID = -1,
|
||||||
ECC_CURVE_DEF = 0, /* NIST or SECP */
|
ECC_CURVE_DEF = 0, /* NIST or SECP */
|
||||||
|
|
||||||
@@ -272,7 +272,8 @@ typedef enum ecc_curve_id {
|
|||||||
ECC_CURVE_CUSTOM,
|
ECC_CURVE_CUSTOM,
|
||||||
#endif
|
#endif
|
||||||
ECC_CURVE_MAX
|
ECC_CURVE_MAX
|
||||||
} ecc_curve_id;
|
};
|
||||||
|
typedef enum ecc_curve_ids ecc_curve_id;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_ECC
|
#ifdef HAVE_ECC
|
||||||
|
@@ -33,7 +33,6 @@
|
|||||||
#include <sl_se_manager_key_derivation.h>
|
#include <sl_se_manager_key_derivation.h>
|
||||||
#include <sl_se_manager_signature.h>
|
#include <sl_se_manager_signature.h>
|
||||||
|
|
||||||
typedef enum ecc_curve_id ecc_curve_id;
|
|
||||||
typedef struct ecc_key ecc_key;
|
typedef struct ecc_key ecc_key;
|
||||||
|
|
||||||
int silabs_ecc_sign_hash (const byte* in, word32 inlen,
|
int silabs_ecc_sign_hash (const byte* in, word32 inlen,
|
||||||
|
@@ -1270,11 +1270,11 @@
|
|||||||
#define TIME_OVERRIDES
|
#define TIME_OVERRIDES
|
||||||
#ifndef XTIME
|
#ifndef XTIME
|
||||||
#error "Must define XTIME externally see porting guide"
|
#error "Must define XTIME externally see porting guide"
|
||||||
#error "https://www.wolfssl.com/docs/porting-guide/"
|
/* https://www.wolfssl.com/docs/porting-guide/ */
|
||||||
#endif
|
#endif
|
||||||
#ifndef XGMTIME
|
#ifndef XGMTIME
|
||||||
#error "Must define XGMTIME externally see porting guide"
|
#error "Must define XGMTIME externally see porting guide"
|
||||||
#error "https://www.wolfssl.com/docs/porting-guide/"
|
/* https://www.wolfssl.com/docs/porting-guide/ */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -4346,14 +4346,17 @@ extern void uITRON4_free(void *p) ;
|
|||||||
|
|
||||||
#ifdef WOLFSSL_HARDEN_TLS
|
#ifdef WOLFSSL_HARDEN_TLS
|
||||||
#if defined(HAVE_TRUNCATED_HMAC) && !defined(WOLFSSL_HARDEN_TLS_ALLOW_TRUNCATED_HMAC)
|
#if defined(HAVE_TRUNCATED_HMAC) && !defined(WOLFSSL_HARDEN_TLS_ALLOW_TRUNCATED_HMAC)
|
||||||
#error "Truncated HMAC Extension not allowed https://www.rfc-editor.org/rfc/rfc9325#section-4.6"
|
#error "Truncated HMAC Extension not allowed"
|
||||||
|
/* https://www.rfc-editor.org/rfc/rfc9325#section-4.6 */
|
||||||
#endif
|
#endif
|
||||||
#if !defined(NO_OLD_TLS) && !defined(WOLFSSL_HARDEN_TLS_ALLOW_OLD_TLS)
|
#if !defined(NO_OLD_TLS) && !defined(WOLFSSL_HARDEN_TLS_ALLOW_OLD_TLS)
|
||||||
#error "TLS < 1.2 protocol versions not allowed https://www.rfc-editor.org/rfc/rfc9325#section-3.1.1"
|
#error "TLS < 1.2 protocol versions not allowed"
|
||||||
|
/* https://www.rfc-editor.org/rfc/rfc9325#section-3.1.1 */
|
||||||
#endif
|
#endif
|
||||||
#if !defined(WOLFSSL_NO_TLS12) && !defined(HAVE_SECURE_RENEGOTIATION) && \
|
#if !defined(WOLFSSL_NO_TLS12) && !defined(HAVE_SECURE_RENEGOTIATION) && \
|
||||||
!defined(HAVE_SERVER_RENEGOTIATION_INFO) && !defined(WOLFSSL_HARDEN_TLS_NO_SCR_CHECK)
|
!defined(HAVE_SERVER_RENEGOTIATION_INFO) && !defined(WOLFSSL_HARDEN_TLS_NO_SCR_CHECK)
|
||||||
#error "TLS 1.2 requires at least HAVE_SERVER_RENEGOTIATION_INFO to send the secure renegotiation extension https://www.rfc-editor.org/rfc/rfc9325#section-3.5"
|
#error "TLS 1.2 requires at least HAVE_SERVER_RENEGOTIATION_INFO to send the secure renegotiation extension"
|
||||||
|
/* https://www.rfc-editor.org/rfc/rfc9325#section-3.5 */
|
||||||
#endif
|
#endif
|
||||||
#if !defined(WOLFSSL_EXTRA_ALERTS) || !defined(WOLFSSL_CHECK_ALERT_ON_ERR)
|
#if !defined(WOLFSSL_EXTRA_ALERTS) || !defined(WOLFSSL_CHECK_ALERT_ON_ERR)
|
||||||
#error "RFC9325 requires some additional alerts to be sent"
|
#error "RFC9325 requires some additional alerts to be sent"
|
||||||
|
Reference in New Issue
Block a user