- markus@cvs.openbsd.org 2001/01/22 23:06:39

     [auth1.c auth2.c readconf.c readconf.h servconf.c servconf.h
      sshconnect1.c sshconnect2.c sshd.c]
     rename skey -> challenge response.
     auto-enable kbd-interactive for ssh2 if challenge-reponse is enabled.

1 files changed, 3 insertions, 3 deletions

diff --git a/auth1.c b/auth1.c
index 50037fd83..1dc2284a7 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.13 2001/01/21 19:05:43 markus Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.14 2001/01/22 23:06:39 markus Exp $");
 
 #ifdef HAVE_OSF_SIA
 # include <sia.h>
@@ -281,7 +281,7 @@ do_authloop(Authctxt *authctxt)
 
                 case SSH_CMSG_AUTH_TIS:
                         debug("rcvd SSH_CMSG_AUTH_TIS");
-                        if (options.skey_authentication == 1) {
+                        if (options.challenge_reponse_authentication == 1) {
                                 char *challenge = get_challenge(authctxt, authctxt->style);
                                 if (challenge != NULL) {
                                         debug("sending challenge '%s'", challenge);
@@ -296,7 +296,7 @@ do_authloop(Authctxt *authctxt)
 
                 case SSH_CMSG_AUTH_TIS_RESPONSE:
                         debug("rcvd SSH_CMSG_AUTH_TIS_RESPONSE");
-                        if (options.skey_authentication == 1) {
+                        if (options.challenge_reponse_authentication == 1) {
                                 char *response = packet_get_string(&dlen);
                                 debug("got response '%s'", response);
                                 packet_integrity_check(plen, 4 + dlen, type);