Skip to content

Commit bd8ef5a

Browse files
committedApr 23, 2018
Merge branch 'feature/add_wolfssl_library' into 'master'
feat(wolfssl): Add wolfssl commercial library V3.14.0 See merge request sdk/ESP8266_RTOS_SDK!79
2 parents 1644dba + 895b1b7 commit bd8ef5a

File tree

13 files changed

+6302
-1
lines changed

13 files changed

+6302
-1
lines changed
 

‎components/freertos/component.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Component Makefile
33
#
4-
COMPONENT_ADD_INCLUDEDIRS += include
4+
COMPONENT_ADD_INCLUDEDIRS += include include/freertos
55

66
COMPONENT_SRCDIRS := library

‎components/ssl/Kconfig

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ config SSL_USING_MBEDTLS
1212
bool "mbedTLS"
1313
config SSL_USING_AXTLS
1414
bool "axTLS"
15+
config SSL_USING_WOLFSSL
16+
bool "wolfSSL"
1517
endchoice
1618

1719
endmenu

‎components/ssl/component.mk

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
# Component Makefile
33
#
44

5+
ifdef CONFIG_SSL_USING_WOLFSSL
6+
COMPONENT_ADD_INCLUDEDIRS := wolfssl/include
7+
8+
WOLFSSLLIB = wolfssl
9+
COMPONENT_ADD_LDFLAGS := -L $(COMPONENT_PATH)/wolfssl/lib -lwolfssl
10+
11+
# re-link program if wolfssl library change
12+
COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/wolfssl/lib/lib%.a,$(WOLFSSLLIB))
13+
else
514
ifdef CONFIG_SSL_USING_MBEDTLS
615
COMPONENT_ADD_INCLUDEDIRS := openssl/include
716
COMPONENT_PRIV_INCLUDEDIRS := openssl/include/internal openssl/include/openssl openssl/include/platform
@@ -14,3 +23,4 @@ else
1423
COMPONENT_ADD_INCLUDEDIRS := axtls/include
1524
COMPONENT_SRCDIRS := axtls/source/ssl axtls/source/crypto
1625
endif
26+
endif
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/* user_settings.h
2+
*
3+
* Copyright (C) 2006-2017 wolfSSL Inc. All rights reserved.
4+
* Additions Copyright 2018 Espressif Systems (Shanghai) PTE LTD.
5+
*
6+
* This file is part of wolfSSL.
7+
*
8+
* Contact licensing@wolfssl.com with any questions or comments.
9+
*
10+
* http://www.wolfssl.com
11+
*/
12+
13+
14+
#ifndef __USER_SETTINGS_H__
15+
#define __USER_SETTINGS_H__
16+
17+
#define WOLFSSL_LWIP
18+
#define NO_WRITEV
19+
#define NO_WOLFSSL_DIR
20+
#define NO_INLINE
21+
#define NO_WOLFSSL_MEMORY
22+
#define HAVE_PK_CALLBACKS
23+
#define WOLFSSL_KEY_GEN
24+
#define WOLFSSL_RIPEMD
25+
#define ESP_PLATFORM
26+
#define DEBUG_ESP_PLATFORM
27+
#define USE_WOLFSSL_IO
28+
#define WOLFSSL_STATIC_RSA
29+
#define NO_DH
30+
#define NO_MD4
31+
#define NO_MD5
32+
#define NO_DES3
33+
#define NO_DSA
34+
#define NO_OLD_TLS
35+
#define HAVE_ECC
36+
#define WC_NO_HARDEN
37+
#define FREERTOS
38+
#define WOLFSSL_TYPES
39+
#define NO_FILESYSTEM
40+
41+
#ifdef WOLFSSL_TYPES
42+
#ifndef byte
43+
typedef unsigned char byte;
44+
#endif
45+
typedef unsigned short word16;
46+
typedef unsigned int word32;
47+
typedef byte word24[3];
48+
#endif
49+
50+
#ifndef CUSTOM_RAND_GENERATE_BLOCK
51+
52+
/* To use define the following:*/
53+
#define CUSTOM_RAND_GENERATE_BLOCK myRngFunc
54+
extern int myRngFunc(byte* output, word32 sz);
55+
56+
#endif
57+
58+
#endif
59+

0 commit comments

Comments
 (0)
Please sign in to comment.