From ba3ab9c0bdf6c069d1da927f7a0eab82bf02c918 Mon Sep 17 00:00:00 2001 From: olpc user Date: Wed, 8 Jan 2020 20:18:46 -0800 Subject: password is cat --- git-maintenance/store.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'git-maintenance/store.sh') diff --git a/git-maintenance/store.sh b/git-maintenance/store.sh index c9c13c2..09fc17f 100755 --- a/git-maintenance/store.sh +++ b/git-maintenance/store.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash -PASS="$(ls "/run/media/"*/*"/key.fsojp.aes256" | head -n 1)" +#PASS="$(ls "/run/media/"*/*"/key.fsojp.aes256" | head -n 1)" +echo +echo == Enter password. == +echo +PASS="pass:$(echo 53616c7465645f5f6eb8e165b79052263e125e4070138e26b3d127bb36e3e943f212d2d761a4426170cc2c17c58bc5d67c99eddb1df6ee1c02d7b33dd95ecdf0 | xxd -ps -r | openssl aes-256-cbc -salt -pbkdf2 -d)" ROOTDIR="$(git rev-parse --show-toplevel)" cd "$ROOTDIR" GITDIR="$ROOTDIR/.git" @@ -9,20 +13,17 @@ MAINTDIR="$ROOTDIR/git-maintenance" PUBKEY=1KwpZECcrGWnM3AFVSbv3Xr5qguV4yG2sV URLPFX="https://bico.media/$PUBKEY" -if ! curl -sfI "$URLPFX"/refs.aes>/dev/null; then echo "Remember to get on internet."; exit 2; fi - -# problem: IVs are producing files that do not have the same content each time, -# and a reupload of everything is made each store. +if ! curl -sfI "$URLPFX"/refs.aes>/dev/null; then echo; echo "== Remember to get on internet. =="; echo; exit 2; fi #export GZIP=-9n TAR="tar -J --owner=0 --group=0 --numeric-owner --mode=go=rX,u+rw,a-s" encrypt() { - openssl aes-256-cbc -salt -pbkdf2 -pass "file:$PASS" -e + openssl aes-256-cbc -salt -pbkdf2 -pass "$PASS" -e } decrypt() { - openssl aes-256-cbc -salt -pbkdf2 -pass "file:$PASS" -d + openssl aes-256-cbc -salt -pbkdf2 -pass "$PASS" -d } if ! [ -e "$PASS" ]; then echo "Remember to plug in USB key."; exit 1; fi @@ -82,8 +83,8 @@ rm "$tmpfile" mv "$tmpfile".list encrypted/list.txt $TAR -cv encrypted/list.txt refs HEAD packed-refs | encrypt > encrypted/refs.aes rm encrypted/list.txt -cp -va "$MAINTDIR"/get.sh encrypted -if [ "$(curl -s "$URLPFX"/get.sh | sha256sum)" = "$(cat encrypted/get.sh | sha256sum)" ]; then rm encrypted/get.sh; fi +cp -va "$MAINTDIR"/dog.sh encrypted +if [ "$(curl -s "$URLPFX"/dog.sh | sha256sum)" = "$(cat encrypted/dog.sh | sha256sum)" ]; then rm encrypted/dog.sh; fi -- cgit v1.2.3