Skip to content
Snippets Groups Projects
Commit 24e2a959 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'libsodium-fix' into 'master'

Libsodium fix

See merge request !5
parents 060de420 47023719
No related branches found
No related tags found
1 merge request!5Libsodium fix
...@@ -191,8 +191,7 @@ pub fn create(secret_path: &str, archive_path: &str, folder: &str) -> Result<(), ...@@ -191,8 +191,7 @@ pub fn create(secret_path: &str, archive_path: &str, folder: &str) -> Result<(),
//TODO: ensure file size matches //TODO: ensure file size matches
let sig = unsafe { sign::sign(&plain::as_bytes(&header)[64..], &secret_key) }; header.signature = sign::sign_detached(unsafe { &plain::as_bytes(&header)[64..] }, &secret_key).0;
header.signature.copy_from_slice(&sig);
// Write archive header // Write archive header
archive_file.seek(SeekFrom::Start(0)) archive_file.seek(SeekFrom::Start(0))
......
#!/usr/bin/env bash #!/usr/bin/env bash
build=release
if [[ "$1" == "-d" ]]; then
build=debug
fi
set -ex set -ex
rm -rf target/test rm -rf target/test
mkdir -p target/test mkdir -p target/test
cargo build --release if [[ "$build" == debug ]]; then
cargo build
else
cargo build --release
fi
time target/release/pkgar \ time target/$build/pkgar \
keygen \ keygen \
--secret target/test/secret.key \ --secret target/test/secret.key \
--public target/test/public.key --public target/test/public.key
time target/release/pkgar \ time target/$build/pkgar \
create \ create \
--secret target/test/secret.key \ --secret target/test/secret.key \
--file target/test/src.pkg \ --file target/test/src.pkg \
src src
time target/release/pkgar \ time target/$build/pkgar \
extract \ extract \
--public target/test/public.key \ --public target/test/public.key \
--file target/test/src.pkg \ --file target/test/src.pkg \
target/test/src target/test/src
diff -ruwN src target/test/src diff -ruwN src target/test/src
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment