From 5b074fe6818519f3b91ba7a1164e68c56440b210 Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 4 Apr 2018 17:31:04 +0800 Subject: [PATCH 1/3] feat(openssl): Move openssl to components --- {third_party => components}/openssl/OpenSSL-APIs.rst | 0 {include/openssl => components/openssl/include}/internal/ssl3.h | 0 .../openssl => components/openssl/include}/internal/ssl_cert.h | 0 .../openssl => components/openssl/include}/internal/ssl_code.h | 0 .../openssl => components/openssl/include}/internal/ssl_dbg.h | 0 .../openssl => components/openssl/include}/internal/ssl_lib.h | 0 .../openssl => components/openssl/include}/internal/ssl_methods.h | 0 .../openssl => components/openssl/include}/internal/ssl_pkey.h | 0 .../openssl => components/openssl/include}/internal/ssl_stack.h | 0 .../openssl => components/openssl/include}/internal/ssl_types.h | 0 .../openssl => components/openssl/include}/internal/ssl_x509.h | 0 {include/openssl => components/openssl/include}/internal/tls1.h | 0 .../openssl => components/openssl/include}/internal/x509_vfy.h | 0 {include/openssl => components/openssl/include}/openssl/ssl.h | 0 .../openssl => components/openssl/include}/platform/ssl_opt.h | 0 {include/openssl => components/openssl/include}/platform/ssl_pm.h | 0 .../openssl => components/openssl/include}/platform/ssl_port.h | 0 {third_party/openssl => components/openssl/source}/Makefile | 0 .../openssl => components/openssl/source}/library/Makefile | 0 .../openssl => components/openssl/source}/library/ssl_cert.c | 0 .../openssl => components/openssl/source}/library/ssl_lib.c | 0 .../openssl => components/openssl/source}/library/ssl_methods.c | 0 .../openssl => components/openssl/source}/library/ssl_pkey.c | 0 .../openssl => components/openssl/source}/library/ssl_stack.c | 0 .../openssl => components/openssl/source}/library/ssl_x509.c | 0 .../openssl => components/openssl/source}/platform/Makefile | 0 .../openssl => components/openssl/source}/platform/ssl_pm.c | 0 .../openssl/source}/platform/ssl_pm_extend.c | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename {third_party => components}/openssl/OpenSSL-APIs.rst (100%) rename {include/openssl => components/openssl/include}/internal/ssl3.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_cert.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_code.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_dbg.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_lib.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_methods.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_pkey.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_stack.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_types.h (100%) rename {include/openssl => components/openssl/include}/internal/ssl_x509.h (100%) rename {include/openssl => components/openssl/include}/internal/tls1.h (100%) rename {include/openssl => components/openssl/include}/internal/x509_vfy.h (100%) rename {include/openssl => components/openssl/include}/openssl/ssl.h (100%) rename {include/openssl => components/openssl/include}/platform/ssl_opt.h (100%) rename {include/openssl => components/openssl/include}/platform/ssl_pm.h (100%) rename {include/openssl => components/openssl/include}/platform/ssl_port.h (100%) rename {third_party/openssl => components/openssl/source}/Makefile (100%) rename {third_party/openssl => components/openssl/source}/library/Makefile (100%) rename {third_party/openssl => components/openssl/source}/library/ssl_cert.c (100%) rename {third_party/openssl => components/openssl/source}/library/ssl_lib.c (100%) rename {third_party/openssl => components/openssl/source}/library/ssl_methods.c (100%) rename {third_party/openssl => components/openssl/source}/library/ssl_pkey.c (100%) rename {third_party/openssl => components/openssl/source}/library/ssl_stack.c (100%) rename {third_party/openssl => components/openssl/source}/library/ssl_x509.c (100%) rename {third_party/openssl => components/openssl/source}/platform/Makefile (100%) rename {third_party/openssl => components/openssl/source}/platform/ssl_pm.c (100%) rename {third_party/openssl => components/openssl/source}/platform/ssl_pm_extend.c (100%) diff --git a/third_party/openssl/OpenSSL-APIs.rst b/components/openssl/OpenSSL-APIs.rst similarity index 100% rename from third_party/openssl/OpenSSL-APIs.rst rename to components/openssl/OpenSSL-APIs.rst diff --git a/include/openssl/internal/ssl3.h b/components/openssl/include/internal/ssl3.h similarity index 100% rename from include/openssl/internal/ssl3.h rename to components/openssl/include/internal/ssl3.h diff --git a/include/openssl/internal/ssl_cert.h b/components/openssl/include/internal/ssl_cert.h similarity index 100% rename from include/openssl/internal/ssl_cert.h rename to components/openssl/include/internal/ssl_cert.h diff --git a/include/openssl/internal/ssl_code.h b/components/openssl/include/internal/ssl_code.h similarity index 100% rename from include/openssl/internal/ssl_code.h rename to components/openssl/include/internal/ssl_code.h diff --git a/include/openssl/internal/ssl_dbg.h b/components/openssl/include/internal/ssl_dbg.h similarity index 100% rename from include/openssl/internal/ssl_dbg.h rename to components/openssl/include/internal/ssl_dbg.h diff --git a/include/openssl/internal/ssl_lib.h b/components/openssl/include/internal/ssl_lib.h similarity index 100% rename from include/openssl/internal/ssl_lib.h rename to components/openssl/include/internal/ssl_lib.h diff --git a/include/openssl/internal/ssl_methods.h b/components/openssl/include/internal/ssl_methods.h similarity index 100% rename from include/openssl/internal/ssl_methods.h rename to components/openssl/include/internal/ssl_methods.h diff --git a/include/openssl/internal/ssl_pkey.h b/components/openssl/include/internal/ssl_pkey.h similarity index 100% rename from include/openssl/internal/ssl_pkey.h rename to components/openssl/include/internal/ssl_pkey.h diff --git a/include/openssl/internal/ssl_stack.h b/components/openssl/include/internal/ssl_stack.h similarity index 100% rename from include/openssl/internal/ssl_stack.h rename to components/openssl/include/internal/ssl_stack.h diff --git a/include/openssl/internal/ssl_types.h b/components/openssl/include/internal/ssl_types.h similarity index 100% rename from include/openssl/internal/ssl_types.h rename to components/openssl/include/internal/ssl_types.h diff --git a/include/openssl/internal/ssl_x509.h b/components/openssl/include/internal/ssl_x509.h similarity index 100% rename from include/openssl/internal/ssl_x509.h rename to components/openssl/include/internal/ssl_x509.h diff --git a/include/openssl/internal/tls1.h b/components/openssl/include/internal/tls1.h similarity index 100% rename from include/openssl/internal/tls1.h rename to components/openssl/include/internal/tls1.h diff --git a/include/openssl/internal/x509_vfy.h b/components/openssl/include/internal/x509_vfy.h similarity index 100% rename from include/openssl/internal/x509_vfy.h rename to components/openssl/include/internal/x509_vfy.h diff --git a/include/openssl/openssl/ssl.h b/components/openssl/include/openssl/ssl.h similarity index 100% rename from include/openssl/openssl/ssl.h rename to components/openssl/include/openssl/ssl.h diff --git a/include/openssl/platform/ssl_opt.h b/components/openssl/include/platform/ssl_opt.h similarity index 100% rename from include/openssl/platform/ssl_opt.h rename to components/openssl/include/platform/ssl_opt.h diff --git a/include/openssl/platform/ssl_pm.h b/components/openssl/include/platform/ssl_pm.h similarity index 100% rename from include/openssl/platform/ssl_pm.h rename to components/openssl/include/platform/ssl_pm.h diff --git a/include/openssl/platform/ssl_port.h b/components/openssl/include/platform/ssl_port.h similarity index 100% rename from include/openssl/platform/ssl_port.h rename to components/openssl/include/platform/ssl_port.h diff --git a/third_party/openssl/Makefile b/components/openssl/source/Makefile similarity index 100% rename from third_party/openssl/Makefile rename to components/openssl/source/Makefile diff --git a/third_party/openssl/library/Makefile b/components/openssl/source/library/Makefile similarity index 100% rename from third_party/openssl/library/Makefile rename to components/openssl/source/library/Makefile diff --git a/third_party/openssl/library/ssl_cert.c b/components/openssl/source/library/ssl_cert.c similarity index 100% rename from third_party/openssl/library/ssl_cert.c rename to components/openssl/source/library/ssl_cert.c diff --git a/third_party/openssl/library/ssl_lib.c b/components/openssl/source/library/ssl_lib.c similarity index 100% rename from third_party/openssl/library/ssl_lib.c rename to components/openssl/source/library/ssl_lib.c diff --git a/third_party/openssl/library/ssl_methods.c b/components/openssl/source/library/ssl_methods.c similarity index 100% rename from third_party/openssl/library/ssl_methods.c rename to components/openssl/source/library/ssl_methods.c diff --git a/third_party/openssl/library/ssl_pkey.c b/components/openssl/source/library/ssl_pkey.c similarity index 100% rename from third_party/openssl/library/ssl_pkey.c rename to components/openssl/source/library/ssl_pkey.c diff --git a/third_party/openssl/library/ssl_stack.c b/components/openssl/source/library/ssl_stack.c similarity index 100% rename from third_party/openssl/library/ssl_stack.c rename to components/openssl/source/library/ssl_stack.c diff --git a/third_party/openssl/library/ssl_x509.c b/components/openssl/source/library/ssl_x509.c similarity index 100% rename from third_party/openssl/library/ssl_x509.c rename to components/openssl/source/library/ssl_x509.c diff --git a/third_party/openssl/platform/Makefile b/components/openssl/source/platform/Makefile similarity index 100% rename from third_party/openssl/platform/Makefile rename to components/openssl/source/platform/Makefile diff --git a/third_party/openssl/platform/ssl_pm.c b/components/openssl/source/platform/ssl_pm.c similarity index 100% rename from third_party/openssl/platform/ssl_pm.c rename to components/openssl/source/platform/ssl_pm.c diff --git a/third_party/openssl/platform/ssl_pm_extend.c b/components/openssl/source/platform/ssl_pm_extend.c similarity index 100% rename from third_party/openssl/platform/ssl_pm_extend.c rename to components/openssl/source/platform/ssl_pm_extend.c From 8d41261f2eba37674510ffe2b2ac1b200703f323 Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 4 Apr 2018 18:58:49 +0800 Subject: [PATCH 2/3] feat(openssl): Add component.mk for openssl --- components/openssl/component.mk | 6 +++ components/openssl/source/Makefile | 54 --------------------- components/openssl/source/library/Makefile | 46 ------------------ components/openssl/source/platform/Makefile | 46 ------------------ 4 files changed, 6 insertions(+), 146 deletions(-) create mode 100644 components/openssl/component.mk delete mode 100644 components/openssl/source/Makefile delete mode 100644 components/openssl/source/library/Makefile delete mode 100644 components/openssl/source/platform/Makefile diff --git a/components/openssl/component.mk b/components/openssl/component.mk new file mode 100644 index 00000000..96621774 --- /dev/null +++ b/components/openssl/component.mk @@ -0,0 +1,6 @@ +# +# Component Makefile +# +COMPONENT_ADD_INCLUDEDIRS := include/openssl include/internal include/platform + +COMPONENT_SRCDIRS := source/library source/platform diff --git a/components/openssl/source/Makefile b/components/openssl/source/Makefile deleted file mode 100644 index 3afa8fd1..00000000 --- a/components/openssl/source/Makefile +++ /dev/null @@ -1,54 +0,0 @@ - -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of images to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -ifndef PDIR -UP_EXTRACT_DIR = .. -GEN_LIBS = libopenssl.a -COMPONENTS_libopenssl = library/liblibrary.a platform/libplatform.a -endif - -CCFLAGS += -fno-aggressive-loop-optimizations - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# -DEFINES += -D_POSIX_SOURCE \ - -DLWIP_OPEN_SRC \ - -DPBUF_RSV_FOR_WLAN \ - -DEBUF_LWIP \ - -DMEMLEAK_DEBUG - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(SDK_PATH)/include/openssl/ \ - -I $(SDK_PATH)/include/openssl/openssl \ - -I $(SDK_PATH)/include/openssl/internal \ - -I $(SDK_PATH)/include/openssl/platform -INCLUDES += -I ./ -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile - diff --git a/components/openssl/source/library/Makefile b/components/openssl/source/library/Makefile deleted file mode 100644 index 10f4067c..00000000 --- a/components/openssl/source/library/Makefile +++ /dev/null @@ -1,46 +0,0 @@ - -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of images to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -ifndef PDIR - -GEN_LIBS = liblibrary.a - -endif - - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# -#DEFINES += - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(PDIR)include -INCLUDES += -I ./ -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile - diff --git a/components/openssl/source/platform/Makefile b/components/openssl/source/platform/Makefile deleted file mode 100644 index 749b4787..00000000 --- a/components/openssl/source/platform/Makefile +++ /dev/null @@ -1,46 +0,0 @@ - -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of images to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -ifndef PDIR - -GEN_LIBS = libplatform.a - -endif - - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# -#DEFINES += - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(PDIR)include -INCLUDES += -I ./ -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile - From dd46b6c9fa1f995ee6b79058bc6682f7fe88b6bf Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 4 Apr 2018 19:01:36 +0800 Subject: [PATCH 3/3] fix(ci): Just a hack to pass ci firstly Will remove these when refactor finish. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1e0d22e8..27144426 100644 --- a/Makefile +++ b/Makefile @@ -424,5 +424,5 @@ INCLUDES += -I $(SDK_PATH)/include/nopoll INCLUDES += -I $(SDK_PATH)/include/spiffs INCLUDES += -I $(SDK_PATH)/include/ssl INCLUDES += -I $(SDK_PATH)/include/json -INCLUDES += -I $(SDK_PATH)/include/openssl +INCLUDES += -I $(SDK_PATH)/components/openssl/include INCLUDES += -I $(SDK_PATH)/include/mqtt