Merge branch 'fs/ssh-signing-other-keytypes'

The cryptographic signing using ssh keys can specify literal keys
for keytypes whose name do not begin with the "ssh-" prefix by
using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").

* fs/ssh-signing-other-keytypes:
  ssh signing: make sign/amend test more resilient
  ssh signing: support non ssh-* keytypes

diff --cc gpg-interface.c
Simple merge

diff --cc t/lib-gpg.sh
index 3fadfcb306a2dd885e131170b32ab53aa3878028,6434feb6c14a86b715522c52b71cfd701015a169..3e7ee1386aa9fcb572652dc38768d099cdfc8368
--- 1/t/lib-gpg.sh
--- 2/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@@ -90,11 -90,8 +90,12 @@@ test_lazy_prereq RFC1991 
  GPGSSH_KEY_PRIMARY="${GNUPGHOME}/ed25519_ssh_signing_key"
  GPGSSH_KEY_SECONDARY="${GNUPGHOME}/rsa_2048_ssh_signing_key"
  GPGSSH_KEY_UNTRUSTED="${GNUPGHOME}/untrusted_ssh_signing_key"
 +GPGSSH_KEY_EXPIRED="${GNUPGHOME}/expired_ssh_signing_key"
 +GPGSSH_KEY_NOTYETVALID="${GNUPGHOME}/notyetvalid_ssh_signing_key"
 +GPGSSH_KEY_TIMEBOXEDVALID="${GNUPGHOME}/timeboxed_valid_ssh_signing_key"
 +GPGSSH_KEY_TIMEBOXEDINVALID="${GNUPGHOME}/timeboxed_invalid_ssh_signing_key"
  GPGSSH_KEY_WITH_PASSPHRASE="${GNUPGHOME}/protected_ssh_signing_key"
+ GPGSSH_KEY_ECDSA="${GNUPGHOME}/ecdsa_ssh_signing_key"
  GPGSSH_KEY_PASSPHRASE="super_secret"
  GPGSSH_ALLOWED_SIGNERS="${GNUPGHOME}/ssh.all_valid.allowedSignersFile"
  
@@@ -114,56 -115,14 +115,58 @@@ test_lazy_prereq GPGSSH 
        chmod 0700 "${GNUPGHOME}" &&
        (setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&
        ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null &&
 -      echo "\"principal with number 1\" $(cat "${GPGSSH_KEY_PRIMARY}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
        ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
 -      echo "\"principal with number 2\" $(cat "${GPGSSH_KEY_SECONDARY}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
        ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/dev/null &&
 -      echo "\"principal with number 3\" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
 -      ssh-keygen -t ecdsa -N "" -f "${GPGSSH_KEY_ECDSA}" >/dev/null
 -      echo "\"principal with number 4\" $(cat "${GPGSSH_KEY_ECDSA}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
 -      ssh-keygen -t ed25519 -N "" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null
++      ssh-keygen -t ecdsa -N "" -f "${GPGSSH_KEY_ECDSA}" >/dev/null &&
 +      ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null &&
 +
 +      cat >"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
 +      "principal with number 1" $(cat "${GPGSSH_KEY_PRIMARY}.pub")"
 +      "principal with number 2" $(cat "${GPGSSH_KEY_SECONDARY}.pub")"
 +      "principal with number 3" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")"
++      "principal with number 4" $(cat "${GPGSSH_KEY_ECDSA}.pub")"
 +      EOF
 +
 +      # Verify if at least one key and ssh-keygen works as expected
 +      echo "testpayload" |
 +      ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_PRIMARY}" >gpgssh_prereq.sig &&
 +      ssh-keygen -Y find-principals -f "${GPGSSH_ALLOWED_SIGNERS}" -s gpgssh_prereq.sig &&
 +      echo "testpayload" |
 +      ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with number 1" -s gpgssh_prereq.sig
 +'
 +
 +test_lazy_prereq GPGSSH_VERIFYTIME '
 +      # Check if ssh-keygen has a verify-time option by passing an invalid date to it
 +      ssh-keygen -Overify-time=INVALID -Y check-novalidate -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
 +
 +      # Set up keys with key lifetimes
 +      ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&
 +      key_valid=$(cat "${GPGSSH_KEY_TIMEBOXEDVALID}.pub") &&
 +      ssh-keygen -t ed25519 -N "" -C "timeboxed invalid key" -f "${GPGSSH_KEY_TIMEBOXEDINVALID}" >/dev/null &&
 +      key_invalid=$(cat "${GPGSSH_KEY_TIMEBOXEDINVALID}.pub") &&
 +      ssh-keygen -t ed25519 -N "" -C "expired key" -f "${GPGSSH_KEY_EXPIRED}" >/dev/null &&
 +      key_expired=$(cat "${GPGSSH_KEY_EXPIRED}.pub") &&
 +      ssh-keygen -t ed25519 -N "" -C "not yet valid key" -f "${GPGSSH_KEY_NOTYETVALID}" >/dev/null &&
 +      key_notyetvalid=$(cat "${GPGSSH_KEY_NOTYETVALID}.pub") &&
 +
 +      # Timestamps outside of test_tick span
 +      ts2005a=20050401000000 ts2005b=200504020000 &&
 +      # Timestamps within test_tick span
 +      ts2005c=20050407000000 ts2005d=200504100000 &&
 +      # Definitely not yet valid / expired timestamps
 +      ts2000=20000101000000 ts2999=29990101000000 &&
 +
 +      cat >>"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
 +      "timeboxed valid key" valid-after="$ts2005c",valid-before="$ts2005d" $key_valid"
 +      "timeboxed invalid key" valid-after="$ts2005a",valid-before="$ts2005b" $key_invalid"
 +      "principal with expired key" valid-before="$ts2000" $key_expired"
 +      "principal with not yet valid key" valid-after="$ts2999" $key_notyetvalid"
 +      EOF
 +
 +      # and verify ssh-keygen verifies the key lifetime
 +      echo "testpayload" |
 +      ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_EXPIRED}" >gpgssh_verifytime_prereq.sig &&
 +      ! (ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
  '
  
  sanitize_pgp() {

diff --cc t/t7528-signed-commit-ssh.sh
index dae76ded0c695e015e6487706cdf8df1e031149d,0ec5a6d7649ebaf6eb5b0df743aecea9c8d9d2c5..f47e99517983163e0bbb3fce9c35800270fe4e28
--- 1/t/t7528-signed-commit-ssh.sh
--- 2/t/t7528-signed-commit-ssh.sh
+++ b/t/t7528-signed-commit-ssh.sh
@@@ -73,26 -73,31 +73,48 @@@ test_expect_success GPGSSH 'create sign
        git tag eleventh-signed $(cat oid) &&
        echo 12 | git commit-tree --gpg-sign="${GPGSSH_KEY_UNTRUSTED}" HEAD^{tree} >oid &&
        test_line_count = 1 oid &&
-       git tag twelfth-signed-alt $(cat oid)
+       git tag twelfth-signed-alt $(cat oid) &&
+ 
+       echo 13>file && test_tick && git commit -a -m thirteenth -S"${GPGSSH_KEY_ECDSA}" &&
+       git tag thirteenth-signed-ecdsa
+ '
+ 
+ test_expect_success GPGSSH 'sign commits using literal public keys with ssh-agent' '
+       test_when_finished "test_unconfig commit.gpgsign" &&
+       test_config gpg.format ssh &&
+       eval $(ssh-agent) &&
+       test_when_finished "kill ${SSH_AGENT_PID}" &&
+       ssh-add "${GPGSSH_KEY_PRIMARY}" &&
+       echo 1 >file && git add file &&
+       git commit -a -m rsa-inline -S"$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
+       echo 2 >file &&
+       test_config user.signingkey "$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
+       git commit -a -m rsa-config -S &&
+       ssh-add "${GPGSSH_KEY_ECDSA}" &&
+       echo 3 >file &&
+       git commit -a -m ecdsa-inline -S"key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
+       echo 4 >file &&
+       test_config user.signingkey "key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
+       git commit -a -m ecdsa-config -S
  '
  
 +test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys having defined lifetimes' '
 +      test_when_finished "test_unconfig commit.gpgsign" &&
 +      test_config gpg.format ssh &&
 +
 +      echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
 +      git tag expired-signed &&
 +
 +      echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
 +      git tag notyetvalid-signed &&
 +
 +      echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
 +      git tag timeboxedvalid-signed &&
 +
 +      echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
 +      git tag timeboxedinvalid-signed
 +'
 +
  test_expect_success GPGSSH 'verify and show signatures' '
        test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
        test_config gpg.mintrustlevel UNDEFINED &&