Skip to content

Use libindy with rusql fix for ios build #306

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

Merged
mirgee merged 11 commits into from
Jun 28, 2021
Merged

Use libindy with rusql fix for ios build #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c33824a
Use libindy with rusql fix for ios build
Patrik-Stas Jun 23, 2021
610f151
Try to build indy from 1.16.0release by commit hash for ios build
Patrik-Stas Jun 23, 2021
e932b6d
Try rusql fix with correct indy/indy-sys dependencies
Patrik-Stas Jun 24, 2021
ce8f2a8
Binary search, try ios build with indy 32e30b6ca
Patrik-Stas Jun 24, 2021
8c566e2
Add list of indy commits on masteer
Patrik-Stas Jun 24, 2021
41e92c5
Try using vendored feature
mirgee Jun 24, 2021
4156ccd
Try using vendored for ios only
mirgee Jun 24, 2021
b3f2b7e
Use vendored openssl with rusql fix libindy version
Patrik-Stas Jun 24, 2021
1d34340
Try using OPENSSL_NO_VENDOR
mirgee Jun 24, 2021
2179967
Use vendored for all archs except musl via environment variables
mirgee Jun 25, 2021
f6fb54e
Remove comments
mirgee Jun 25, 2021
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ jobs:
run: |
set -x
sudo rm -rf "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY" "/usr/local/lib/android" "/usr/share/dotnet"
docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \
docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
bash -c '(cd $HOME/libvcx && \
RUST_TEST_THREADS=1 cargo test --release --features "general_test" && \
cd $HOME/agency_client && \
Expand Down Expand Up @@ -514,7 +514,7 @@ jobs:
- name: Run pool integration tests
run: |
set -x
docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \
docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
bash -c '(cd $HOME/libvcx && \
RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "pool_tests agency_v2")'

Expand Down Expand Up @@ -573,7 +573,7 @@ jobs:
- name: Run agency+pool integration tests
run: |
set -x
docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \
docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
bash -c '(cd $HOME/libvcx && \
cargo --version && \
rustc --version && \
Expand Down
18 changes: 14 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions agency_client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ reqwest = "0.9.5"
regex = "1.1.0"
rmp-serde = "0.13.7"
rust-base58 = "0.0.4"
indy = "1.16.0"
indy = "1.16.0-post-59"
futures = "0.1.23"
url = "1.5.1"
failure = "0.1.6"
Expand All @@ -30,7 +30,7 @@ rand = "0.3"
android_logger = "0.5"

[package.metadata.deb]
depends = "libindy (= 1.16.0)"
depends = "libindy (= 1.16.0-post-59)"
extended-description = """\
This is the official SDK for Hyperledger Indy, which provides a\
distributed-ledger-based foundation for self-sovereign identity.\
Expand Down
5 changes: 2 additions & 3 deletions ci/alpine_core.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ FROM alpine:3.12 AS builder
ARG UID=1000
ARG GID=1000


ARG INDYSDK_PATH=/home/indy/indy-sdk
ARG INDYSDK_REPO=https://github.com/hyperledger/indy-sdk.git
ARG INDYSDK_REVISION=v1.16.0
ARG INDYSDK_REVISION=efb7215

ENV RUST_LOG=warning

Expand All @@ -22,7 +21,7 @@ RUN apk update && apk upgrade && \
openssl-dev \
zeromq-dev

ARG RUST_VER="1.45.2"
ARG RUST_VER="1.53.0"
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER

USER indy
Expand Down
3 changes: 2 additions & 1 deletion ci/libvcx.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ WORKDIR /home/indy
COPY --chown=indy ./ ./

USER indy
ENV X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR "true"
RUN cargo build --release --manifest-path=/home/indy/Cargo.toml

USER root
Expand Down Expand Up @@ -44,7 +45,7 @@ RUN apk add --no-cache \
python2 \
zeromq-dev

ARG RUST_VER="1.45.2"
ARG RUST_VER="1.53.0"
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER


Expand Down
2 changes: 1 addition & 1 deletion ci/ubuntu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ARG uid=1000
RUN useradd -ms /bin/bash -u $uid vcx
USER vcx

ARG RUST_VER="1.45.2"
ARG RUST_VER="1.53.0"
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER
ENV PATH /home/vcx/.cargo/bin:$PATH

Expand Down
8 changes: 4 additions & 4 deletions libvcx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ regex = "1.1.0"
rust-base58 = "0.0.4"
rmp-serde = "0.13.7"
base64 = "0.8.0"
openssl = { version = "0.10.29" }
openssl = { version = "0.10.35", features = ["vendored"] }
Copy link
Contributor Author

@Patrik-Stas Patrik-Stas Jun 28, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I was looking at this and got concerned about the feature description

The vendored copy will not be configured to automatically find the system’s root certificates, but the openssl-probe crate can be used to do that instead.

So I went through actual usage of openssl crate and it turn out it might be an overkill. What's being used is:

use openssl::sha::sha256
use openssl::bn::BigNum;

I somewhat presumed openssl is there because reqwest needs it, but reqwest comes has its own tls dependency https://github.com/seanmonstar/reqwest/blob/master/Cargo.toml

So our openssl usage is not actually ever dealing with certificates, so the quote on top of this comment doesn't matter. I think ultimate solution will be to get rid of openssl dependency.
Perhaps:

But lets do that separately

num-traits = "0.2.0"
indy = "1.16.0"
indy-sys = "1.16.0"
indy = "1.16.0-post-59"
indy-sys = "1.16.0-post-59"
futures = "0.3.15"
tokio = { version = "1.7.1", features = ["rt-multi-thread"] }
libloading = "0.5.0"
Expand All @@ -69,7 +69,7 @@ serde_json = "1.0"
serde_derive = "1.0"

[package.metadata.deb]
depends = "libindy (= 1.16.0)"
depends = "libindy (= 1.16.0-post-59)"
extended-description = """\
This is the official SDK for Hyperledger Indy, which provides a\
distributed-ledger-based foundation for self-sovereign identity.\
Expand Down
4 changes: 2 additions & 2 deletions wrappers/ios/ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ for i in $(ls -t $OPENSSL_PATH); do
break
done

INDY_VERSION="v1.16.0"
INDY_VERSION="efb7215" # indy-1.16.0-post-59 - "v1.16.0" + rusql update fix + (number of other commits on master branch)
REPO_DIR=$PWD
SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
OUTPUT_DIR=/tmp/artifacts
INDY_SDK_DIR=$OUTPUT_DIR/indy-sdk

setup() {
echo "Setup rustup"
rustup default 1.45.2
rustup default 1.53.0
rustup component add rls-preview rust-analysis rust-src

echo "Setup rustup target platforms"
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/ci/android.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN apt-get install -y nodejs
USER indy

# Install Rust toolchain
ARG RUST_VER=1.45.2
ARG RUST_VER=1.53.0
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST_VER}
ENV PATH /home/indy/.cargo/bin:$PATH

Expand Down