jigen/git-remote-gcrypt
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Provide clear messages for signing and verifying

Browse source
This commit is contained in:
root 2013-02-14 00:00:00 +00:00
parent c689a38782
commit 1112174651
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
git-remote-gcrypt
View file

@ -168,7 +168,7 @@ CLEARSIGN()
{ {
if [ "$CONF_SIGN_MANIFEST" = "true" ] if [ "$CONF_SIGN_MANIFEST" = "true" ]
then then
echo_info "Signing new manifest" echo_info "Requesting manifest signature for push"
gpg --output - --clearsign gpg --output - --clearsign
else else
cat cat
@ -222,12 +222,13 @@ make_new_repo()
exit 1 exit 1
fi fi
PUTREPO "$URL" PUTREPO "$URL"
echo_info "Encrypting to \"$RECIPIENTS\"" echo_info "Generating master key"
echo_info "Generating new master key" echo_info "Requesting master key signature"
MASTERKEY="$(genkey)" MASTERKEY="$(genkey)"
KEYSIGN=$(printf "%s\n" "$MASTERKEY" | gpg --output - --clearsign) KEYSIGN=$(printf "%s\n" "$MASTERKEY" | gpg --output - --clearsign)
TMPMASTERKEY_ENC="$LOCALDIR/masterenc.$$" TMPMASTERKEY_ENC="$LOCALDIR/masterenc.$$"
trap 'rm -f "$TMPMASTERKEY_ENC"' EXIT trap 'rm -f "$TMPMASTERKEY_ENC"' EXIT
echo_info "Encrypting masterkey to \"$RECIPIENTS\""
printf "%s" "$KEYSIGN" | gpg --batch --no-default-keyring \ printf "%s" "$KEYSIGN" | gpg --batch --no-default-keyring \
--secret-keyring /dev/null --keyring "$CONF_KEYRING" \ --secret-keyring /dev/null --keyring "$CONF_KEYRING" \
--compress-algo none -e $RECIPIENTS > "$TMPMASTERKEY_ENC" --compress-algo none -e $RECIPIENTS > "$TMPMASTERKEY_ENC"
@ -240,9 +241,8 @@ get_masterkey()
{ {
TMPMASTERKEY_ENC="$LOCALDIR/masterenc.$$" TMPMASTERKEY_ENC="$LOCALDIR/masterenc.$$"
trap 'rm -f "$TMPMASTERKEY_ENC"' EXIT trap 'rm -f "$TMPMASTERKEY_ENC"' EXIT
echo_info "Verifying masterkey signature"
GET "$URL" masterkey 2>/dev/null > "$TMPMASTERKEY_ENC" || return 0 GET "$URL" masterkey 2>/dev/null > "$TMPMASTERKEY_ENC" || return 0
#echo_info "Opening Master Key" echo_info "Verifying master key signature"
gpg -q -d < "$TMPMASTERKEY_ENC" | CHECKSIGN || { gpg -q -d < "$TMPMASTERKEY_ENC" | CHECKSIGN || {
echo_info "Opening of master key failed!" echo_info "Opening of master key failed!"
echo_info "Using keyring $CONF_KEYRING" echo_info "Using keyring $CONF_KEYRING"