core
/
trifid
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 7 Releases Wiki Activity

remove the dependency on openssl (merge)

This commit is contained in:
c0repwn3r 2023-07-25 21:12:36 -04:00
parent c5ea1a0b99 5bb5b5fe48
commit 5005240699
Signed by: core
GPG Key ID: FDBF740DADDCEECF
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2057,7 +2057,7 @@ dependencies = [
[[package]] [[package]]
name = "nebula-ffi" name = "nebula-ffi"
version = "0.1.3" version = "0.1.4"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"gobuild", "gobuild",

2
nebula-ffi/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "nebula-ffi" name = "nebula-ffi"
version = "0.1.3" version = "0.1.4"
edition = "2021" edition = "2021"
description = "A Rust wrapper crate for communicating with Nebula via a CGO FFI." description = "A Rust wrapper crate for communicating with Nebula via a CGO FFI."
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"

2
nebula-ffi/build.rs
View File

@ -15,7 +15,7 @@ fn main() {
compiler = "go"; compiler = "go";
} }
gobuild::Build::new().compiler(compiler).buildmode(BuildMode::CShared).file("main.go").compile("nebulaffi"); gobuild::Build::new().compiler(compiler).buildmode(BuildMode::CArchive).file("main.go").compile("nebulaffi");
println!("Go compile success"); println!("Go compile success");

6
packages/void_amd64_tfcli/build.sh
View File

@ -4,8 +4,8 @@ set -e
cd $1 || exit cd $1 || exit
cd tfcli || exit cd tfcli || exit
echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-musl)" echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-gnu)"
cargo build --release --target x86_64-unknown-linux-musl cargo build --release
cd ../packages/void_amd64_tfcli || exit cd ../packages/void_amd64_tfcli || exit
@ -17,7 +17,7 @@ mkdir -p work/etc/sv
echo "Copying tfcli binary" echo "Copying tfcli binary"
cp ../../target/x86_64-unknown-linux-musl/release/tfcli work/usr/bin/tfcli cp ../../target/release/tfcli work/usr/bin/tfcli
chmod 755 work/usr/bin/tfcli chmod 755 work/usr/bin/tfcli
echo "Building XBPS package" echo "Building XBPS package"

6
packages/void_amd64_tfclient/build.sh
View File

@ -4,8 +4,8 @@ set -e
cd $1 || exit cd $1 || exit
cd tfclient || exit cd tfclient || exit
echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-musl)" echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-gnu)"
cargo build --release --target x86_64-unknown-linux-musl cargo build --release
cd ../packages/void_amd64_tfclient || exit cd ../packages/void_amd64_tfclient || exit
@ -17,7 +17,7 @@ mkdir -p work/etc/sv
echo "Copying tfclient binary" echo "Copying tfclient binary"
cp ../../target/x86_64-unknown-linux-musl/release/tfclient work/usr/bin/tfclient cp ../../target/release/tfclient work/usr/bin/tfclient
chmod 755 work/usr/bin/tfclient chmod 755 work/usr/bin/tfclient
cp -r tfclient work/etc/sv cp -r tfclient work/etc/sv

3
trifid-api/src/routes/v1/dnclient.rs
View File

@ -10,9 +10,8 @@ use dnapi_rs::message::{
DoUpdateResponse, EnrollResponse, RequestV1, RequestWrapper, SignedResponse, DoUpdateResponse, EnrollResponse, RequestV1, RequestWrapper, SignedResponse,
SignedResponseWrapper, SignedResponseWrapper,
}; };
use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey}; use ed25519_dalek::{Signature, Signer, Verifier, VerifyingKey};
use log::{debug, error}; use log::{debug, error};
use rand::rngs::OsRng;
use std::clone::Clone; use std::clone::Clone;
use trifid_pki::cert::{deserialize_ed25519_public, deserialize_x25519_public}; use trifid_pki::cert::{deserialize_ed25519_public, deserialize_x25519_public};
use trifid_pki::x25519_dalek::PublicKey; use trifid_pki::x25519_dalek::PublicKey;