diff options
| author | Ollivier Robert <roberto@FreeBSD.org> | 2016-08-22 20:48:46 +0000 |
|---|---|---|
| committer | Ollivier Robert <roberto@FreeBSD.org> | 2016-08-22 20:48:46 +0000 |
| commit | 6eb79b4759781789751979fc4e461016276cdf25 (patch) | |
| tree | a647b15f95483680d5475eec2b3a726ddf2b9c03 /lib/libpam | |
| parent | f81d0b43f1507b4d4b322399d7a58536e50aa6d5 (diff) | |
| download | src-6eb79b4759781789751979fc4e461016276cdf25.tar.gz src-6eb79b4759781789751979fc4e461016276cdf25.zip | |
Remove support for SSH1 as it is already disabled in our OpenSSH.
Submitted by: vangyzen
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=304635
Diffstat (limited to 'lib/libpam')
| -rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.8 | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8 index de0a9515aacf..1afcfc77e6c1 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.8 +++ b/lib/libpam/modules/pam_ssh/pam_ssh.8 @@ -128,9 +128,7 @@ Start an agent even if no keys were decrypted during the 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 diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c index 95c9bfee617c..821228dfc3da 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -77,7 +77,6 @@ static const char *pam_ssh_prompt = "SSH passphrase: "; 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 */ |