Skip to content
This repository was archived by the owner on Oct 23, 2022. It is now read-only.

Commit d0910ab

Browse files
committed
feat: use the Ed25519 key instead of RSA by default; removes openssl dep
Signed-off-by: ljedrz <[email protected]>
1 parent dff2dfb commit d0910ab

File tree

7 files changed

+39
-237
lines changed

7 files changed

+39
-237
lines changed

.github/workflows/ci.yml

+4-16
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,18 @@ jobs:
8484
8585
- name: Install dependencies ubuntu
8686
if: matrix.platform.host == 'ubuntu-latest'
87-
run: sudo apt-get install llvm-dev libssl-dev pkg-config
87+
run: sudo apt-get install llvm-dev pkg-config
8888

8989
- name: Install dependencies macos
9090
if: matrix.platform.host == 'macos-latest'
91-
run: brew install llvm openssl
91+
run: brew install llvm
9292

9393
- name: Download go-ipfs on Linux
9494
if: matrix.platform.host == 'ubuntu-latest'
9595
run: |
9696
curl -L https://github.com/ipfs/go-ipfs/releases/download/v0.6.0/go-ipfs_v0.6.0_linux-amd64.tar.gz --output go_ipfs.tar.gz
9797
tar -xf go_ipfs.tar.gz
9898
99-
- name: Install dependencies windows (openssl)
100-
uses: lukka/[email protected]
101-
id: windows-runvcpkg
102-
if: matrix.platform.host == 'windows-latest'
103-
with:
104-
vcpkgDirectory: '${{ runner.workspace }}/vcpkg'
105-
vcpkgTriplet: 'x64-windows'
106-
vcpkgArguments: 'openssl'
107-
vcpkgGitCommitId: 'ffa41582f78478812c836a6e8ce315fb27431182' # ok for openssl-sys v0.9.58
108-
10999
- name: Install rust toolchain
110100
uses: hecrj/setup-rust-action@v1
111101
with:
@@ -132,13 +122,11 @@ jobs:
132122

133123
- name: Build (android)
134124
if: contains(matrix.platform.target, 'android')
135-
run: cargo ndk --android-platform 29 --target ${{ matrix.platform.target }} build --locked --workspace --exclude ipfs-http
136-
# exclude http on android because openssl
125+
run: cargo ndk --android-platform 29 --target ${{ matrix.platform.target }} build --locked --workspace
137126

138127
- name: Build other cross compilations
139128
if: contains(matrix.platform.target, 'android') == false && matrix.platform.cross == true
140-
run: cargo build --locked --workspace --exclude ipfs-http --target ${{ matrix.platform.target }}
141-
# exclude http on other cross compilation targets because openssl
129+
run: cargo build --locked --workspace --target ${{ matrix.platform.target }}
142130

143131
- name: Rust tests (macos)
144132
if: matrix.platform.cross == false && matrix.platform.host == 'macos-latest'

Cargo.lock

+1-55
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/patches/bits.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- node_modules/ipfsd-ctl/src/ipfsd-daemon.js
2+
+++ node_modules/ipfsd-ctl/src/ipfsd-daemon.js
3+
@@ -88,7 +88,6 @@ class Daemon {
4+
const opts = merge(
5+
{
6+
emptyRepo: false,
7+
- bits: this.opts.test ? 1024 : 2048,
8+
profiles: this.opts.test ? ['test'] : []
9+
},
10+
typeof this.opts.ipfsOptions.init === 'boolean' ? {} : this.opts.ipfsOptions.init,

conformance/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ const options = {
2222
disposable: true,
2323
ipfsHttpModule: require('ipfs-http-client'),
2424
ipfsOptions: {
25-
init: {
26-
bits: 2048
27-
}
25+
init: true,
2826
}
2927
}
3028

http/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ futures = { default-features = false, version = "0.3" }
1818
humantime = { default-features = false, version = "2.0" }
1919
hyper = { default-features = false, version = "0.13" }
2020
ipfs = { path = "../" }
21+
libp2p-core = { default-features = false, version = "0.22" }
2122
mime = { default-features = false, version = "0.3" }
2223
mpart-async = { default-features = false, version = "0.4" }
2324
multibase = { default-features = false, version = "0.8" }
2425
multihash = { default-features = false, version = "0.11" }
25-
# openssl is required for rsa keygen but not used by the rust-ipfs or its dependencies
26-
openssl = { default-features = false, version = "0.10" }
2726
parity-multiaddr = { default-features = false, version = "0.9" }
2827
percent-encoding = { default-features = false, version = "2.1" }
2928
prost = { default-features = false, version = "0.6.1" }

0 commit comments

Comments
 (0)