From owner-svn-src-all@freebsd.org  Mon Aug 22 20:48:48 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FAA3BC2255;
 Mon, 22 Aug 2016 20:48:48 +0000 (UTC)
 (envelope-from roberto@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0241617E8;
 Mon, 22 Aug 2016 20:48:47 +0000 (UTC)
 (envelope-from roberto@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MKmlaI009304;
 Mon, 22 Aug 2016 20:48:47 GMT (envelope-from roberto@FreeBSD.org)
Received: (from roberto@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MKmlJH009302;
 Mon, 22 Aug 2016 20:48:47 GMT (envelope-from roberto@FreeBSD.org)
Message-Id: <201608222048.u7MKmlJH009302@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: roberto set sender to
 roberto@FreeBSD.org using -f
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Mon, 22 Aug 2016 20:48:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304635 - head/lib/libpam/modules/pam_ssh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2016 20:48:48 -0000

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 */