Thanks to visit codestin.com
Credit goes to github.com

Skip to content

WIP: LibGit2 - mbedTLS stream support #17246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 31 commits into from
Closed

WIP: LibGit2 - mbedTLS stream support #17246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9c63d77
added libhttp_parser build script
wildart May 24, 2016
5d0de3e
added libmbedtls build script
wildart May 24, 2016
a3b10ea
added patch for libssh2 backend
wildart May 24, 2016
5512fed
removed distclean option
wildart May 24, 2016
c23c731
added libssh2 build script
wildart May 24, 2016
55f1380
enable ssh in libgit2
wildart May 24, 2016
55bd933
added RPATH parameters to cmake builds, switched libssh2 and libgit2 …
wildart May 25, 2016
08262d8
fixed incorrect libgit2 sha1
wildart May 25, 2016
aa5bed7
update: build script to generate debug info, branch info
wildart May 26, 2016
265db4a
updated libgit2 reference
wildart May 27, 2016
5003e03
windows config fixed
wildart Jun 30, 2016
1341d48
Put back accidentally deleted `endif`
Keno Jul 1, 2016
620373e
apply libgit2 patch for windows only
wildart Jul 2, 2016
4ae5893
mbedtls build configuration without git-external
wildart Jul 2, 2016
3f20759
fix libgit2-ssh patch
wildart Jul 3, 2016
71e7be1
add updated cmake ppa to travis config
wildart Jul 3, 2016
508bbf1
fixed incorrect mbedtls patch location
wildart Jul 3, 2016
858666f
restore http_parser
wildart Jul 4, 2016
ab4f674
added mbedtls TLS stream support for libgit2
wildart Jul 4, 2016
3ea97ef
use original libgit2 0.24.1 version with tls stream patch
wildart Jul 4, 2016
51a7c2e
update deps makefile
wildart Jul 4, 2016
5528588
initialize TLS stream after libgit2 is loaded
wildart Jul 4, 2016
90af61a
disable CA certificate loading on windows
wildart Jul 4, 2016
36a6d53
fix travis config for x86
wildart Jul 4, 2016
13cc976
update build config
wildart Jul 4, 2016
e0839ab
reordering dependencies
wildart Jul 4, 2016
de6ba4e
correct http_parser build config
wildart Jul 4, 2016
d101dab
correct initialization of TLS steam backend (linux only)
wildart Jul 4, 2016
288a7b2
win: patch http_parser and disable mbedtls stream builder
wildart Jul 4, 2016
3856181
fixing CI scripts
wildart Jul 5, 2016
e689366
setting correct dependencies, fixed patches (temporaty disable parall…
wildart Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added libmbedtls build script
  • Loading branch information
@wildart
wildart committed Jun 28, 2016
commit 5d0de3edb9917f0a68d1c323c845620f2fe769b7
50 changes: 50 additions & 0 deletions deps/mbedtls.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
## mbedtls

MBEDTLS_GIT_URL := git://github.com/ARMmbed/mbedtls.git
MBEDTLS_TAR_URL = https://api.github.com/repos/ARMmbed/mbedtls/tarball/$1
$(eval $(call git-external,mbedtls,MBEDTLS,CMakeLists.txt,build/libmbedtls.$(SHLIB_EXT),$(SRCDIR)/srccache))

MBEDTLS_OBJ_SOURCE := $(BUILDDIR)/$(MBEDTLS_SRC_DIR)/library/libmbedtls.$(SHLIB_EXT) $(BUILDDIR)/$(MBEDTLS_SRC_DIR)/library/libmbedx509.$(SHLIB_EXT) $(BUILDDIR)/$(MBEDTLS_SRC_DIR)/library/libmbedcrypto.$(SHLIB_EXT)
MBEDTLS_OBJ_TARGET := $(build_shlibdir)/libmbedtls.$(SHLIB_EXT) $(build_shlibdir)/libmbedx509.$(SHLIB_EXT) $(build_shlibdir)/libmbedcrypto.$(SHLIB_EXT)

#-DCMAKE_PREFIX_PATH=$(build_prefix)
MBEDTLS_OPTS := $(CMAKE_COMMON) -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DENABLE_PROGRAMS=OFF -DENABLE_ZLIB_SUPPORT=ON -DENABLE_TESTING=OFF
ifeq ($(OS),WINNT)
MBEDTLS_OPTS += -DCMAKE_BUILD_TYPE=RelWithDebInfo
else
MBEDTLS_OPTS += -DCMAKE_BUILD_TYPE=Release
endif

$(BUILDDIR)/$(MBEDTLS_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(MBEDTLS_SRC_DIR)/CMakeLists.txt
mkdir -p $(dir $@)
cd $(dir $@) && \
$(CMAKE) $(dir $<) $(MBEDTLS_OPTS)
touch -c $@

$(MBEDTLS_OBJ_SOURCE): $(BUILDDIR)/$(MBEDTLS_SRC_DIR)/Makefile
$(MAKE) -C $(dir $<)
touch -c $@

$(BUILDDIR)/$(MBEDTLS_SRC_DIR)/checked: $(MBEDTLS_OBJ_SOURCE)
ifeq ($(OS),$(BUILD_OS))
$(MAKE) -C $(dir $@) test
endif
echo 1 > $@

$(MBEDTLS_OBJ_TARGET): $(MBEDTLS_OBJ_SOURCE) | $(build_shlibdir)
$(call make-install,$(MBEDTLS_SRC_DIR),)
touch -c $(MBEDTLS_OBJ_TARGET)

clean-mbedtls:
-rm -rf $(BUILDDIR)/$(MBEDTLS_SRC_DIR)
-rm -f $(MBEDTLS_OBJ_TARGET)
distclean-mbedtls:
-rm -rf $(SRCDIR)/srccache/mbedtls-$(MBEDTLS_SHA1).tar.gz \
$(SRCDIR)/srccache/mbedtls-$(MBEDTLS_SHA1) \
$(BUILDDIR)/mbedtls-$(MBEDTLS_SHA1)

get-mbedtls: $(MBEDTLS_SRC_FILE)
configure-mbedtls: $(BUILDDIR)/$(MBEDTLS_SRC_DIR)/Makefile
compile-mbedtls: $(MBEDTLS_OBJ_SOURCE)
check-mbedtls: $(BUILDDIR)/$(MBEDTLS_SRC_DIR)/checked
install-mbedtls: $(MBEDTLS_OBJ_TARGET)
2 changes: 2 additions & 0 deletions deps/mbedtls.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MBEDTLS_BRANCH=master
MBEDTLS_SHA1=bfafadb45daf8d2114e3109e2f9021fc72ee36bb