summaryrefslogtreecommitdiff
path: root/auth2-chall.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2018-07-20 13:18:28 +1000
committerDamien Miller <djm@mindrot.org>2018-07-31 12:59:30 +1000
commit87f08be054b7eeadbb9cdeb3fb4872be79ccf218 (patch)
tree80bfc724ddd93228b8571702a2f153787994022b /auth2-chall.c
parent5d14019ba2ff54acbfd20a6b9b96bb860a8c7c31 (diff)
Remove support for S/Key
Most people will 1) be using modern multi-factor authentication methods like TOTP/OATH etc and 2) be getting support for multi-factor authentication via PAM or BSD Auth.
Diffstat (limited to 'auth2-chall.c')
-rw-r--r--auth2-chall.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/auth2-chall.c b/auth2-chall.c
index 4fd18f467..2d5cff448 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -58,9 +58,6 @@ extern KbdintDevice bsdauth_device;
58#ifdef USE_PAM 58#ifdef USE_PAM
59extern KbdintDevice sshpam_device; 59extern KbdintDevice sshpam_device;
60#endif 60#endif
61#ifdef SKEY
62extern KbdintDevice skey_device;
63#endif
64#endif 61#endif
65 62
66KbdintDevice *devices[] = { 63KbdintDevice *devices[] = {
@@ -70,9 +67,6 @@ KbdintDevice *devices[] = {
70#ifdef USE_PAM 67#ifdef USE_PAM
71 &sshpam_device, 68 &sshpam_device,
72#endif 69#endif
73#ifdef SKEY
74 &skey_device,
75#endif
76#endif 70#endif
77 NULL 71 NULL
78}; 72};
@@ -369,7 +363,7 @@ input_userauth_info_response(int type, u_int32_t seq, struct ssh *ssh)
369void 363void
370privsep_challenge_enable(void) 364privsep_challenge_enable(void)
371{ 365{
372#if defined(BSD_AUTH) || defined(USE_PAM) || defined(SKEY) 366#if defined(BSD_AUTH) || defined(USE_PAM)
373 int n = 0; 367 int n = 0;
374#endif 368#endif
375#ifdef BSD_AUTH 369#ifdef BSD_AUTH
@@ -378,9 +372,6 @@ privsep_challenge_enable(void)
378#ifdef USE_PAM 372#ifdef USE_PAM
379 extern KbdintDevice mm_sshpam_device; 373 extern KbdintDevice mm_sshpam_device;
380#endif 374#endif
381#ifdef SKEY
382 extern KbdintDevice mm_skey_device;
383#endif
384 375
385#ifdef BSD_AUTH 376#ifdef BSD_AUTH
386 devices[n++] = &mm_bsdauth_device; 377 devices[n++] = &mm_bsdauth_device;
@@ -388,8 +379,5 @@ privsep_challenge_enable(void)
388#ifdef USE_PAM 379#ifdef USE_PAM
389 devices[n++] = &mm_sshpam_device; 380 devices[n++] = &mm_sshpam_device;
390#endif 381#endif
391#ifdef SKEY
392 devices[n++] = &mm_skey_device;
393#endif
394#endif 382#endif
395} 383}