mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 10:19:04 +00:00
19261079b7
Some notable changes, from upstream's release notes: - sshd(8): Remove support for obsolete "host/port" syntax. - ssh(1): When prompting whether to record a new host key, accept the key fingerprint as a synonym for "yes". - ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" (RSA/SHA1) algorithm from those accepted for certificate signatures. - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F support to provide address-space isolation for token middleware libraries (including the internal one). - ssh(1): this release enables UpdateHostkeys by default subject to some conservative preconditions. - scp(1): this release changes the behaviour of remote to remote copies (e.g. "scp host-a:/path host-b:") to transfer through the local host by default. - scp(1): experimental support for transfers using the SFTP protocol as a replacement for the venerable SCP/RCP protocol that it has traditionally used. Additional integration work is needed to support FIDO/U2F in the base system. Deprecation Notice ------------------ OpenSSH will disable the ssh-rsa signature scheme by default in the next release. Reviewed by: imp MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29985
56 lines
1.7 KiB
Bash
56 lines
1.7 KiB
Bash
# $OpenBSD: keygen-convert.sh,v 1.6 2021/07/24 02:57:28 dtucker Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="convert keys"
|
|
|
|
cat > $OBJ/askpass <<EOD
|
|
#!/bin/sh
|
|
echo hunter2
|
|
EOD
|
|
chmod u+x $OBJ/askpass
|
|
|
|
if ${SSHKEYGEN} -? 2>&1 | grep "ssh-keygen -e" >/dev/null; then
|
|
test_import_export=1
|
|
fi
|
|
|
|
for t in ${SSH_KEYTYPES}; do
|
|
# generate user key for agent
|
|
trace "generating $t key"
|
|
rm -f $OBJ/$t-key
|
|
${SSHKEYGEN} -q -N "" -t $t -f $OBJ/$t-key
|
|
|
|
if test "x$test_import_export" = "x1"; then
|
|
trace "export $t private to rfc4716 public"
|
|
${SSHKEYGEN} -q -e -f $OBJ/$t-key >$OBJ/$t-key-rfc || \
|
|
fail "export $t private to rfc4716 public"
|
|
|
|
trace "export $t public to rfc4716 public"
|
|
${SSHKEYGEN} -q -e -f $OBJ/$t-key.pub >$OBJ/$t-key-rfc.pub || \
|
|
fail "$t public to rfc4716 public"
|
|
|
|
cmp $OBJ/$t-key-rfc $OBJ/$t-key-rfc.pub || \
|
|
fail "$t rfc4716 exports differ between public and private"
|
|
|
|
trace "import $t rfc4716 public"
|
|
${SSHKEYGEN} -q -i -f $OBJ/$t-key-rfc >$OBJ/$t-rfc-imported || \
|
|
fail "$t import rfc4716 public"
|
|
|
|
cut -f1,2 -d " " $OBJ/$t-key.pub >$OBJ/$t-key-nocomment.pub
|
|
cmp $OBJ/$t-key-nocomment.pub $OBJ/$t-rfc-imported || \
|
|
fail "$t imported differs from original"
|
|
fi
|
|
|
|
trace "set passphrase $t"
|
|
${SSHKEYGEN} -q -p -P '' -N 'hunter2' -f $OBJ/$t-key >/dev/null || \
|
|
fail "$t set passphrase failed"
|
|
|
|
trace "export $t to public with passphrase"
|
|
SSH_ASKPASS=$OBJ/askpass SSH_ASKPASS_REQUIRE=force \
|
|
${SSHKEYGEN} -y -f $OBJ/$t-key >$OBJ/$t-key-nocomment.pub
|
|
cmp $OBJ/$t-key.pub $OBJ/$t-key-nocomment.pub || \
|
|
fail "$t exported pubkey differs from generated"
|
|
|
|
rm -f $OBJ/$t-key $OBJ/$t-key.pub $OBJ/$t-key-rfc $OBJ/$t-key-rfc.pub \
|
|
$OBJ/$t-rfc-imported $OBJ/$t-key-nocomment.pub
|
|
done
|