diff options
| author | root <root@localhost> | 2013-02-14 00:00:00 +0000 |
|---|---|---|
| committer | root <root@localhost> | 2013-02-14 00:00:00 +0000 |
| commit | 111217465157807848f95ac8f951bc6a3773c793 (patch) | |
| tree | 2230d93c206dceb2a207f3b794a03ea672914eb5 /git-remote-gcrypt | |
| parent | c689a38782d882ebb77c90152943e464dfe61d4f (diff) | |
| download | git-remote-gcrypt-111217465157807848f95ac8f951bc6a3773c793.tar.gz | |
Provide clear messages for signing and verifying
Diffstat (limited to 'git-remote-gcrypt')
| -rwxr-xr-x | git-remote-gcrypt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-remote-gcrypt b/git-remote-gcrypt index 8d07338..dd5fff0 100755 --- a/git-remote-gcrypt +++ b/git-remote-gcrypt @@ -168,7 +168,7 @@ CLEARSIGN() { if [ "$CONF_SIGN_MANIFEST" = "true" ] then - echo_info "Signing new manifest" + echo_info "Requesting manifest signature for push" gpg --output - --clearsign else cat @@ -222,12 +222,13 @@ make_new_repo() exit 1 fi PUTREPO "$URL" - echo_info "Encrypting to \"$RECIPIENTS\"" - echo_info "Generating new master key" + echo_info "Generating master key" + echo_info "Requesting master key signature" MASTERKEY="$(genkey)" KEYSIGN=$(printf "%s\n" "$MASTERKEY" | gpg --output - --clearsign) TMPMASTERKEY_ENC="$LOCALDIR/masterenc.$$" trap 'rm -f "$TMPMASTERKEY_ENC"' EXIT + echo_info "Encrypting masterkey to \"$RECIPIENTS\"" printf "%s" "$KEYSIGN" | gpg --batch --no-default-keyring \ --secret-keyring /dev/null --keyring "$CONF_KEYRING" \ --compress-algo none -e $RECIPIENTS > "$TMPMASTERKEY_ENC" @@ -240,9 +241,8 @@ get_masterkey() { TMPMASTERKEY_ENC="$LOCALDIR/masterenc.$$" trap 'rm -f "$TMPMASTERKEY_ENC"' EXIT - echo_info "Verifying masterkey signature" 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 || { echo_info "Opening of master key failed!" echo_info "Using keyring $CONF_KEYRING" |