Author: roberto
Date: Mon Aug 22 20:48:46 2016
New Revision: 304635
URL: https://svnweb.freebsd.org/changeset/base/304635
Log:
Remove support for SSH1 as it is already disabled in our OpenSSH.
Submitted by: vangyzen
MFC after: 2 weeks
Modified:
head/lib/libpam/modules/pam_ssh/pam_ssh.8
head/lib/libpam/modules/pam_ssh/pam_ssh.c
Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.8
==============================================================================
--- head/lib/libpam/modules/pam_ssh/pam_ssh.8 Mon Aug 22 20:23:39 2016
(r304634)
+++ head/lib/libpam/modules/pam_ssh/pam_ssh.8 Mon Aug 22 20:48:46 2016
(r304635)
@@ -128,9 +128,7 @@ 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
Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- head/lib/libpam/modules/pam_ssh/pam_ssh.c Mon Aug 22 20:23:39 2016
(r304634)
+++ head/lib/libpam/modules/pam_ssh/pam_ssh.c Mon Aug 22 20:48:46 2016
(r304635)
@@ -77,7 +77,6 @@ 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 */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
