Date: Sun, 25 Sep 2016 09:36:52 +0000 (UTC) From: Ollivier Robert <roberto@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r306308 - stable/11/lib/libpam/modules/pam_ssh Message-ID: <201609250936.u8P9aqtl048130@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: roberto Date: Sun Sep 25 09:36:52 2016 New Revision: 306308 URL: https://svnweb.freebsd.org/changeset/base/306308 Log: MFC: 304626,304635: r304626: Add support for Ed25519 keys. r304635: Remove support for SSH1, already disabled in our OpenSSH. Submitted by: mwlucas (r304626), vangyzen (r304635) Modified: stable/11/lib/libpam/modules/pam_ssh/pam_ssh.8 stable/11/lib/libpam/modules/pam_ssh/pam_ssh.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libpam/modules/pam_ssh/pam_ssh.8 ============================================================================== --- stable/11/lib/libpam/modules/pam_ssh/pam_ssh.8 Sun Sep 25 07:48:08 2016 (r306307) +++ stable/11/lib/libpam/modules/pam_ssh/pam_ssh.8 Sun Sep 25 09:36:52 2016 (r306308) @@ -128,15 +128,15 @@ Start an agent even if no keys were decr authentication phase. .El .Sh FILES -.Bl -tag -width ".Pa $HOME/.ssh/identity" -compact -.It Pa $HOME/.ssh/identity -SSH1 RSA key +.Bl -tag -width ".Pa $HOME/.ssh/id_ed25519" -compact .It Pa $HOME/.ssh/id_rsa SSH2 RSA key .It Pa $HOME/.ssh/id_dsa SSH2 DSA key .It Pa $HOME/.ssh/id_ecdsa SSH2 ECDSA key +.It Pa $HOME/.ssh/id_ed25519 +SSH2 Ed25519 key .El .Sh SEE ALSO .Xr ssh-agent 1 , Modified: stable/11/lib/libpam/modules/pam_ssh/pam_ssh.c ============================================================================== --- stable/11/lib/libpam/modules/pam_ssh/pam_ssh.c Sun Sep 25 07:48:08 2016 (r306307) +++ stable/11/lib/libpam/modules/pam_ssh/pam_ssh.c Sun Sep 25 09:36:52 2016 (r306308) @@ -77,10 +77,10 @@ static const char *pam_ssh_prompt = "SSH static const char *pam_ssh_have_keys = "pam_ssh_have_keys"; static const char *pam_ssh_keyfiles[] = { - ".ssh/identity", /* SSH1 RSA key */ ".ssh/id_rsa", /* SSH2 RSA key */ ".ssh/id_dsa", /* SSH2 DSA key */ ".ssh/id_ecdsa", /* SSH2 ECDSA key */ + ".ssh/id_ed25519", /* SSH2 Ed25519 key */ NULL };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609250936.u8P9aqtl048130>