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

Skip to content

Support mbedTLS #3935

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 17 commits into from
Closed

Support mbedTLS #3935

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
04a2b1d
mbedtls cmake config
wildart Oct 9, 2015
cfc27a3
define mbedtls global configuration
wildart Oct 9, 2015
d44d020
added certificate location setup
wildart Oct 9, 2015
a5958d0
introduced GIT_MBEDTLS symbol
wildart Oct 9, 2015
ad2b2e2
added git_mbedtls_stream_new
wildart Oct 9, 2015
101ab46
proper certificate verification & cleanup of `git_mbedtls_stream_new`
wildart Oct 10, 2015
46db15f
use libmbedcrypto for SHA1
wildart Oct 11, 2015
369d23a
added new CI configuration for mbedtls
wildart Oct 11, 2015
4f8968b
add mbedtls stream initialization
wildart May 24, 2016
cc156e4
update to 0.24.1
wildart May 25, 2016
f814681
turned on https feature for mbedtls
wildart May 25, 2016
6b556a6
better search for CA certificates: using EVs and build-time macros
wildart May 27, 2016
a47a6bc
Merge branch 'mbedtls' of https://github.com/wildart/libgit2
joshtriplett Sep 25, 2016
05ca19a
Update for current libgit2 API with struct git_proxy_options
joshtriplett Sep 25, 2016
77cdc58
Cleanups for mbedTLS changes
joshtriplett Sep 25, 2016
dab8d43
mbedtls: Fix travis build
joshtriplett Sep 25, 2016
81555f5
Move USE_MBEDTLS option under not-Darwin condition
joshtriplett Sep 25, 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 new CI configuration for mbedtls
  • Loading branch information
@wildart
wildart committed Jul 29, 2016
commit 369d23a8353b287b790bca18dfd90dbb4dc3a0ef
10 changes: 10 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ matrix:
- VALGRIND=1
OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug"
os: linux
- compiler: gcc
env:
- MBEDTLS=1
OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DUSE_OPENSSL=OFF -DMBEDTLS_ROOT_DIR=../mbedtls"
os: linux
- compiler: gcc
env:
- MBEDTLS=1
OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON -DUSE_OPENSSL=OFF -DMBEDTLS_ROOT_DIR=../mbedtls"
os: linux
allow_failures:
- env: COVERITY=1
- env:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ IF (BUILD_CLAR)
ENDIF ()

ENABLE_TESTING()
IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND)
IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND OR MBEDTLS_FOUND)
ADD_TEST(libgit2_clar libgit2_clar -ionline)
ELSE ()
ADD_TEST(libgit2_clar libgit2_clar -v)
Expand Down
5 changes: 5 additions & 0 deletions script/cibuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ curl -L https://github.com/ethomson/poxyproxy/releases/download/v0.1.0/poxyproxy
# Run this early so we know it's ready by the time we need it
java -jar poxyproxy.jar -d --port 8080 --credentials foo:bar &

if [ -n "$MBEDTLS" ];
then
./script/mbedtls.sh;
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be part of the script that installs the dependencies. The Travis rules currently only do it for osx, but we should remove the if there and run it for linux too. The instructions for installing mbedtls should go there.


mkdir _build
cd _build
# shellcheck disable=SC2086
Expand Down
6 changes: 6 additions & 0 deletions script/mbedtls.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

git clone https://github.com/ARMmbed/mbedtls.git mbedtls
cd mbedtls
git checkout mbedtls-2.1.2
make CFLAGS='-fPIC -fpic' -j2 lib