diff --git a/Cargo.lock b/Cargo.lock index 5220bc2..95cb9bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2057,7 +2057,7 @@ dependencies = [ [[package]] name = "nebula-ffi" -version = "0.1.3" +version = "0.1.4" dependencies = [ "bindgen", "gobuild", diff --git a/nebula-ffi/Cargo.toml b/nebula-ffi/Cargo.toml index 118e73a..e86140a 100644 --- a/nebula-ffi/Cargo.toml +++ b/nebula-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nebula-ffi" -version = "0.1.3" +version = "0.1.4" edition = "2021" description = "A Rust wrapper crate for communicating with Nebula via a CGO FFI." license = "GPL-3.0-or-later" diff --git a/nebula-ffi/build.rs b/nebula-ffi/build.rs index 4cfff8b..a085aba 100644 --- a/nebula-ffi/build.rs +++ b/nebula-ffi/build.rs @@ -15,7 +15,7 @@ fn main() { 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"); diff --git a/packages/void_amd64_tfcli/build.sh b/packages/void_amd64_tfcli/build.sh index 4b5684e..51d3fc1 100755 --- a/packages/void_amd64_tfcli/build.sh +++ b/packages/void_amd64_tfcli/build.sh @@ -4,8 +4,8 @@ set -e cd $1 || exit cd tfcli || exit -echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-musl)" -cargo build --release --target x86_64-unknown-linux-musl +echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-gnu)" +cargo build --release cd ../packages/void_amd64_tfcli || exit @@ -17,7 +17,7 @@ mkdir -p work/etc/sv 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 echo "Building XBPS package" diff --git a/packages/void_amd64_tfclient/build.sh b/packages/void_amd64_tfclient/build.sh index cc3aea7..7af9dbf 100755 --- a/packages/void_amd64_tfclient/build.sh +++ b/packages/void_amd64_tfclient/build.sh @@ -4,8 +4,8 @@ set -e cd $1 || exit cd tfclient || exit -echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-musl)" -cargo build --release --target x86_64-unknown-linux-musl +echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-gnu)" +cargo build --release cd ../packages/void_amd64_tfclient || exit @@ -17,7 +17,7 @@ mkdir -p work/etc/sv 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 cp -r tfclient work/etc/sv diff --git a/trifid-api/src/routes/v1/dnclient.rs b/trifid-api/src/routes/v1/dnclient.rs index 87cea0b..62a6343 100644 --- a/trifid-api/src/routes/v1/dnclient.rs +++ b/trifid-api/src/routes/v1/dnclient.rs @@ -10,9 +10,8 @@ use dnapi_rs::message::{ DoUpdateResponse, EnrollResponse, RequestV1, RequestWrapper, SignedResponse, SignedResponseWrapper, }; -use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey}; +use ed25519_dalek::{Signature, Signer, Verifier, VerifyingKey}; use log::{debug, error}; -use rand::rngs::OsRng; use std::clone::Clone; use trifid_pki::cert::{deserialize_ed25519_public, deserialize_x25519_public}; use trifid_pki::x25519_dalek::PublicKey;