Skip to content

Support builds of OpenSSL from vendored source #684

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

Support builds of OpenSSL from vendored source #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7a84ce
Support vendored builds
sfackler Aug 21, 2017
96233a3
Update CI
sfackler Aug 21, 2017
8b4fc99
Use published openssl-src
sfackler Aug 29, 2017
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
26 changes: 23 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ job: &JOB
- run: ./test/build_openssl.sh
- *SAVE_OPENSSL
- *RESTORE_DEPS
- run: cargo run --manifest-path=systest/Cargo.toml --target $TARGET
- run: cargo run --manifest-path=systest/Cargo.toml --target "$TARGET" --features "$FEATURES"
- run: |
ulimit -c unlimited
export PATH=$OPENSSL_DIR/bin:$PATH
Expand All @@ -53,8 +53,8 @@ job: &JOB
fi
cargo test \
--manifest-path=openssl/Cargo.toml \
--target $TARGET \
--all-features \
--target "$TARGET" \
--features "$FEATURES" \
$TEST_ARGS
- run:
command: |
Expand All @@ -66,15 +66,20 @@ job: &JOB
path: /tmp/core_dumps
- *SAVE_DEPS

vendored: &VENDORED
FEATURES: vendored v110
openssl_110: &OPENSSL_110
LIBRARY: openssl
VERSION: 1.1.0f
FEATURES: v110
openssl_102: &OPENSSL_102
LIBRARY: openssl
VERSION: 1.0.2l
FEATURES: v102
openssl_101: &OPENSSL_101
LIBRARY: openssl
VERSION: 1.0.1u
FEATURES: v101
libressl_250: &LIBRESSL_250
LIBRARY: libressl
VERSION: 2.5.0
Expand All @@ -99,6 +104,10 @@ base: &BASE

version: 2
jobs:
x86_64-vendored:
<<: *JOB
environment:
<<: [*VENDORED, *X86_64, *BASE]
x86_64-openssl-1.1.0:
<<: *JOB
environment:
Expand All @@ -111,6 +120,10 @@ jobs:
<<: *JOB
environment:
<<: [*OPENSSL_101, *X86_64, *BASE]
i686-vendored:
<<: *JOB
environment:
<<: [*VENDORED, *I686, *BASE]
i686-openssl-1.1.0:
<<: *JOB
environment:
Expand All @@ -123,6 +136,10 @@ jobs:
<<: *JOB
environment:
<<: [*OPENSSL_101, *I686, *BASE]
armhf-vendored:
<<: *JOB
environment:
<<: [*VENDORED, *ARMHF, *BASE]
armhf-openssl-1.1.0:
<<: *JOB
environment:
Expand All @@ -147,12 +164,15 @@ workflows:
version: 2
tests:
jobs:
- x86_64-vendored
- x86_64-openssl-1.1.0
- x86_64-openssl-1.0.2
- x86_64-openssl-1.0.1
- i686-vendored
- i686-openssl-1.1.0
- i686-openssl-1.0.2
- i686-openssl-1.0.1
- armhf-vendored
- armhf-openssl-1.1.0
- armhf-openssl-1.0.2
- armhf-openssl-1.0.1
Expand Down
7 changes: 6 additions & 1 deletion openssl-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@ categories = ["cryptography", "external-ffi-bindings"]
links = "openssl"
build = "build.rs"

[features]
vendored = ["openssl-src"]

[dependencies]
libc = "0.2"

[build-dependencies]
pkg-config = "0.3.9"
gcc = "0.3.42"
gcc = "0.3.53"

openssl-src = { version = "110", optional = true }

[target.'cfg(target_env = "msvc")'.build-dependencies]
vcpkg = "0.2"
Expand Down
Loading