diff options
author | green <green@FreeBSD.org> | 2001-07-07 14:19:53 +0000 |
---|---|---|
committer | green <green@FreeBSD.org> | 2001-07-07 14:19:53 +0000 |
commit | 961721080a1e3301313e5959b713173c7fb74f7e (patch) | |
tree | 1233fb99ba7ddfb7868966f561cd4a22d2fa7fa0 /crypto | |
parent | c11e4967f83b90ac91163a0497922273f39e0e99 (diff) | |
download | FreeBSD-src-961721080a1e3301313e5959b713173c7fb74f7e.zip FreeBSD-src-961721080a1e3301313e5959b713173c7fb74f7e.tar.gz |
Fix an incorrect conflict resolution which prevented TISAuthentication
from working right in 2.9.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/openssh/sshconnect1.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/crypto/openssh/sshconnect1.c b/crypto/openssh/sshconnect1.c index 3852796..c324aaf 100644 --- a/crypto/openssh/sshconnect1.c +++ b/crypto/openssh/sshconnect1.c @@ -645,33 +645,10 @@ try_challenge_reponse_authentication(void) } challenge = packet_get_string(&clen); packet_integrity_check(payload_len, (4 + clen), type); - if (options.cipher == SSH_CIPHER_NONE) - log("WARNING: Encryption is disabled! " - "Reponse will be transmitted in clear text."); - fprintf(stderr, "%s\n", challenge); + snprintf(prompt, sizeof prompt, "%s%s", challenge, + strchr(challenge, '\n') ? "" : "\nResponse: "); xfree(challenge); - fflush(stderr); for (i = 0; i < options.number_of_password_prompts; i++) { - /* request a challenge */ - packet_start(SSH_CMSG_AUTH_TIS); - packet_send(); - packet_write_wait(); - - type = packet_read(&payload_len); - if (type != SSH_SMSG_FAILURE && - type != SSH_SMSG_AUTH_TIS_CHALLENGE) { - packet_disconnect("Protocol error: got %d in response " - "to SSH_CMSG_AUTH_TIS", type); - } - if (type != SSH_SMSG_AUTH_TIS_CHALLENGE) { - debug("No challenge."); - return 0; - } - challenge = packet_get_string(&clen); - packet_integrity_check(payload_len, (4 + clen), type); - snprintf(prompt, sizeof prompt, "%s%s", challenge, - strchr(challenge, '\n') ? "" : "\nResponse: "); - xfree(challenge); if (i != 0) error("Permission denied, please try again."); if (options.cipher == SSH_CIPHER_NONE) |