From 98ae3bb7fd05acde500a9823ae18ed69ac3710fa Mon Sep 17 00:00:00 2001 From: Go Hosohara Date: Fri, 1 Jun 2018 13:12:21 +0900 Subject: [PATCH] Add define for OpenSSL API. --- .../cs+/Projects/common/user_settings.h | 4 +++- wolfssl/openssl/ssl.h | 22 +++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/IDE/Renesas/cs+/Projects/common/user_settings.h b/IDE/Renesas/cs+/Projects/common/user_settings.h index 16c0502ce..9e03cd375 100644 --- a/IDE/Renesas/cs+/Projects/common/user_settings.h +++ b/IDE/Renesas/cs+/Projects/common/user_settings.h @@ -64,5 +64,7 @@ #define HAVE_CURVE25519 #define CURVE25519_SMALL #define HAVE_ED25519 +#define NO_OLD_SHA256_NAMES -/* #define NO_WOLFSSL_STUB */ +#define NO_WOLFSSL_STUB +#define WOLFSSL_SHA384 \ No newline at end of file diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index 4765cca06..d292d614c 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -847,13 +847,13 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING; /* matchs ASN_DOMAIN_COMPONENT in asn.h */ /* matchs ASN_..._NAME in asn.h */ -#define NID_surname 0x04, /* SN */ -#define NID_serialNumber 0x05, /* serialNumber */ -#define NID_countryName 0x06, /* C */ -#define NID_localityName 0x07, /* L */ -#define NID_stateOrProvinceName 0x08, /* ST */ -#define NID_organizationName 0x0a, /* O */ -#define NID_organizationalUnitName 0x0b, /* OU */ +#define NID_surname 0x04 /* SN */ +#define NID_serialNumber 0x05 /* serialNumber */ +#define NID_countryName 0x06 /* C */ +#define NID_localityName 0x07 /* L */ +#define NID_stateOrProvinceName 0x08 /* ST */ +#define NID_organizationName 0x0a /* O */ +#define NID_organizationalUnitName 0x0b /* OU */ #define SSL_CTX_set_msg_callback wolfSSL_CTX_set_msg_callback @@ -955,6 +955,14 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING; #define SSL_CTX_set_srp_password wolfSSL_CTX_set_srp_password #define SSL_CTX_set_srp_username wolfSSL_CTX_set_srp_username +#define ERR_NUM_ERRORS 16 +#define EVP_PKEY_RSA 6 +#define EVP_PKEY_RSA2 19 +#define SN_pkcs9_emailAddress "Email" +#define LN_pkcs9_emailAddress "emailAddress" +#define NID_pkcs9_emailAddress 48 +#define OBJ_pkcs9_emailAddress 1L,2L,840L,113539L,1L,9L,1L + #ifdef __cplusplus } /* extern "C" */ #endif