diff --git a/create-attributable-archive.sh b/create-attributable-archive.sh index 70cbdb0..32b224c 100755 --- a/create-attributable-archive.sh +++ b/create-attributable-archive.sh @@ -47,12 +47,16 @@ printf "7z: compressing inner volume" 7z a "$out_dir/contents.7z" "$inner_dir" > /dev/null 2>&1 checkcode $? +printf "deleting $inner_dir" +rm -rf "$inner_dir" +checkcode $? + printf "ssh: signing out/contents.7z" ssh-keygen -Y sign -f "$key_path" -n "$signature_tag" "$out_dir/contents.7z" # > /dev/null 2>&1 checkcode $? -printf "sha512: generating sha512 checksums of files in out/ " -sha512sum "$out_dir/*" >> "$out_dir/checksums.sha512" +printf "sha512: generating sha512 checksums of files in out" +sha512sum $out_dir/* > "$out_dir/checksums.sha512" checkcode $? echo "Enter attribution passphrase:" @@ -72,10 +76,6 @@ unset attribution_passphrase_check cat "$out_dir/contents.7z" } | sha512sum | awk '{print $1}' > "$out_dir/attribution.sha512" -printf "deleting $inner_dir" -rm -rf "$inner_dir" -checkcode $? - printf "sanity checking: verification" bash out/verify-everything.sh checkcode $? @@ -85,4 +85,4 @@ checkcode $? printf "7z archiving outer dir" 7z a "./out.7z" "$out_dir" -checkcode $? \ No newline at end of file +checkcode $? diff --git a/out/.12094 b/out/.12094 deleted file mode 100644 index 2698f1a..0000000 Binary files a/out/.12094 and /dev/null differ diff --git a/out/.592 b/out/.592 new file mode 100644 index 0000000..0cf5a77 Binary files /dev/null and b/out/.592 differ diff --git a/out/anonymous_signer b/out/anonymous_signer index e81b53a..b8581d1 100644 --- a/out/anonymous_signer +++ b/out/anonymous_signer @@ -1 +1 @@ -anonymous namespaces="file-integrity" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzxs8Ok9r5JNevCm3KBvy9Iyg3baSw+Gvz1MaC4mZEE anonymous +anonymous namespaces="file-integrity" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHNjfc58+rgA/WBEhdF8y4r6y4JddB8RPw2AQHHkaZI0 anonymous diff --git a/out/attribution.sha512 b/out/attribution.sha512 new file mode 100644 index 0000000..30bd7d4 --- /dev/null +++ b/out/attribution.sha512 @@ -0,0 +1 @@ +e7ff3efd3222f6dac5f6156c9d417c90dc56c34973b1b86573e139de1edfb2c15334b3fde0b2295cf63b66b567c22f8a95870c54eacfe9e9aeb5f0d31fa1ff2d diff --git a/out/checksums.sha512 b/out/checksums.sha512 new file mode 100644 index 0000000..0918552 --- /dev/null +++ b/out/checksums.sha512 @@ -0,0 +1,5 @@ +51b0e1ebf18adf1dabc4d1e0a1a8f5568e6ab51dd490b9425375c067ba8a9a419f235d761f975bcc8a44bb8135a81cef1be95294e365a51c7b90137dc76f6212 ./out/anonymous_signer +46bd2773528f7670865fb15b7db06e9011989b3aa5bb09c00c4f50a46f5de22225938d9ea25447bef691df598c48505ab8a35fe13baadb47261e4a6cdf4bc8f7 ./out/contents.7z +fc283df1f568f034617c1d1388fcc17b5961e27a5827be686bb4ade269e149511d78ed6150e8339be6925f96980e1529a23e8d15ff18470fa259ffa22b36f97d ./out/contents.7z.sig +f91f1e84c205e1a5d1827be1efb5f576a04894f5649149b6bf5e1cf6e02a29b1470d8aec9ff334a99f5dfc50712a081bfedc182aacd3f6b65249e5f84c0630b3 ./out/test_validation_passphrase.sh +db0617ccc8fd63a0906532e45eca1c2e07cf476cf9d6c68d2241cc6e254afe22e829bacce48e96cff5975cfd07a10dbd4e2d9006214344711a9571edf3e55987 ./out/verify-everything.sh diff --git a/out/contents.7z b/out/contents.7z index d86a9f8..132b0d6 100644 Binary files a/out/contents.7z and b/out/contents.7z differ diff --git a/out/contents.7z.sig b/out/contents.7z.sig new file mode 100644 index 0000000..bed25ab --- /dev/null +++ b/out/contents.7z.sig @@ -0,0 +1,6 @@ +-----BEGIN SSH SIGNATURE----- +U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgc2N9znz6uAD9YESF0XzLivrLgl +10HxE/DYBAceRpkjQAAAAOZmlsZS1pbnRlZ3JpdHkAAAAAAAAABnNoYTUxMgAAAFMAAAAL +c3NoLWVkMjU1MTkAAABA0h80JbN4Gk0q1i9lqF3A1lRFfqjPQrFWblWe1IsZB8fQLl6G8j +l8Igkg5b7ifKRUz36908a/XVkhRbDTUGEkBg== +-----END SSH SIGNATURE----- diff --git a/out/contents/.19601 b/out/contents/.19601 deleted file mode 100644 index 93b7690..0000000 Binary files a/out/contents/.19601 and /dev/null differ diff --git a/private_ed25519_1779530180 b/private_ed25519_1779530180 deleted file mode 100644 index 8b373ac..0000000 --- a/private_ed25519_1779530180 +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACCc8bPDpPa+STXrwptygb8vSMoN22ksPhr89TGguJmRBAAAAJCdSK3LnUit -ywAAAAtzc2gtZWQyNTUxOQAAACCc8bPDpPa+STXrwptygb8vSMoN22ksPhr89TGguJmRBA -AAAEBtkfZIlhs+mzrEMFvt/pQjtONx7dGDWste5YAjFcUzkJzxs8Ok9r5JNevCm3KBvy9I -yg3baSw+Gvz1MaC4mZEEAAAACWFub255bW91cwECAwQ= ------END OPENSSH PRIVATE KEY----- diff --git a/private_ed25519_1779530180.pub b/private_ed25519_1779530180.pub deleted file mode 100644 index 609a018..0000000 --- a/private_ed25519_1779530180.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzxs8Ok9r5JNevCm3KBvy9Iyg3baSw+Gvz1MaC4mZEE anonymous diff --git a/private_ed25519_1779530775 b/private_ed25519_1779530775 new file mode 100644 index 0000000..f6374e1 --- /dev/null +++ b/private_ed25519_1779530775 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBzY33OfPq4AP1gRIXRfMuK+suCXXQfET8NgEBx5GmSNAAAAJAE2OdRBNjn +UQAAAAtzc2gtZWQyNTUxOQAAACBzY33OfPq4AP1gRIXRfMuK+suCXXQfET8NgEBx5GmSNA +AAAEBahLsB5/tAbPyNI//1Smj4wqMSD3wY9n6F2nzHb6GQG3Njfc58+rgA/WBEhdF8y4r6 +y4JddB8RPw2AQHHkaZI0AAAACWFub255bW91cwECAwQ= +-----END OPENSSH PRIVATE KEY----- diff --git a/private_ed25519_1779530775.pub b/private_ed25519_1779530775.pub new file mode 100644 index 0000000..9742850 --- /dev/null +++ b/private_ed25519_1779530775.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHNjfc58+rgA/WBEhdF8y4r6y4JddB8RPw2AQHHkaZI0 anonymous