RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-27 20:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/02/06 22:26:17

Browse Source 
[sshconnect2.c]
     do not ask for passphrase in batch mode; report from ejb@ql.org
   - itojun@cvs.opebsd.org 2001/02/08 10:47:05
     [sshconnect2.c]
     %.30s is too short for IPv6 numeric address.  use %.128s for now.
     markus ok
   - markus@cvs.openbsd.org 2001/02/09 12:28:35
     [sshconnect2.c]
     do not free twice, thanks to /etc/malloc.conf
   - markus@cvs.openbsd.org 2001/02/09 17:10:53
     [sshconnect2.c]
     partial success: debug->log; "Permission denied" if no more auth methods
   - markus@cvs.openbsd.org 2001/02/10 12:09:21
     [sshconnect2.c]
     remove some lines
This commit is contained in:
Ben Lindstrom 2001-02-10 22:16:41 +00:00
parent 8fd10b0f13
commit 03df5bde9c
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -27,6 +27,22 @@
- markus@cvs.openbsd.org 2001/02/10 1:46:28
[ssh.c]
remove mapping of argv[0] -> hostname
- markus@cvs.openbsd.org 2001/02/06 22:26:17
[sshconnect2.c]
do not ask for passphrase in batch mode; report from ejb@ql.org
- itojun@cvs.opebsd.org 2001/02/08 10:47:05
[sshconnect2.c]
%.30s is too short for IPv6 numeric address. use %.128s for now.
markus ok
- markus@cvs.openbsd.org 2001/02/09 12:28:35
[sshconnect2.c]
do not free twice, thanks to /etc/malloc.conf
- markus@cvs.openbsd.org 2001/02/09 17:10:53
[sshconnect2.c]
partial success: debug->log; "Permission denied" if no more auth methods
- markus@cvs.openbsd.org 2001/02/10 12:09:21
[sshconnect2.c]
remove some lines
- (bal) Minor correction to sftp-client.c I made. Should return 'status'
instead of '0' (from the OpenBSD tree)
- (bal) Synced ssh.1 w/ OpenBSD
@ -3813,4 +3829,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.722 2001/02/10 22:11:13 mouring Exp $
$Id: ChangeLog,v 1.723 2001/02/10 22:16:41 mouring Exp $

36
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.41 2001/02/04 15:32:26 stevesk Exp $");
RCSID("$OpenBSD: sshconnect2.c,v 1.46 2001/02/10 12:09:21 markus Exp $");
#include <openssl/bn.h>
#include <openssl/md5.h>
@ -601,13 +601,13 @@ input_userauth_failure(int type, int plen, void *ctxt)
packet_done();
if (partial != 0)
debug("partial success");
log("Authenticated with partial success.");
debug("authentications that can continue: %s", authlist);
for (;;) {
method = authmethod_get(authlist);
if (method == NULL)
fatal("Unable to find an authentication method");
fatal("Permission denied (%s).", authlist);
authctxt->method = method;
if (method->userauth(authctxt) != 0) {
debug2("we sent a %s packet, wait for reply", method->name);
@ -646,7 +646,7 @@ userauth_passwd(Authctxt *authctxt)
if(attempt != 1)
error("Permission denied, please try again.");
snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ",
snprintf(prompt, sizeof(prompt), "%.30s@%.128s's password: ",
authctxt->server_user, authctxt->host);
password = read_passphrase(prompt, 0);
packet_start(SSH2_MSG_USERAUTH_REQUEST);
@ -757,8 +757,10 @@ int
userauth_pubkey_identity(Authctxt *authctxt, char *filename)
{
Key *k;
int i, ret, try_next;
int i, ret, try_next, success = 0;
struct stat st;
char *passphrase;
char prompt[300];
if (stat(filename, &st) != 0) {
debug("key does not exist: %s", filename);
@ -768,9 +770,10 @@ userauth_pubkey_identity(Authctxt *authctxt, char *filename)
k = key_new(KEY_UNSPEC);
if (!load_private_key(filename, "", k, NULL)) {
int success = 0;
char *passphrase;
char prompt[300];
if (options.batch_mode) {
key_free(k);
return 0;
}
snprintf(prompt, sizeof prompt,
"Enter passphrase for key '%.100s': ", filename);
for (i = 0; i < options.number_of_password_prompts; i++) {
@ -879,18 +882,13 @@ userauth_kbdint(Authctxt *authctxt)
}
/*
* parse SSH2_MSG_USERAUTH_INFO_REQUEST, prompt user and send
* SSH2_MSG_USERAUTH_INFO_RESPONSE
* parse INFO_REQUEST, prompt user and send INFO_RESPONSE
*/
void
input_userauth_info_req(int type, int plen, void *ctxt)
{
Authctxt *authctxt = ctxt;
char *name = NULL;
char *inst = NULL;
char *lang = NULL;
char *prompt = NULL;
char *response = NULL;
char *name, *inst, *lang, *prompt, *response;
u_int num_prompts, i;
int echo = 0;
@ -902,15 +900,13 @@ input_userauth_info_req(int type, int plen, void *ctxt)
name = packet_get_string(NULL);
inst = packet_get_string(NULL);
lang = packet_get_string(NULL);
if (strlen(name) > 0)
cli_mesg(name);
xfree(name);
if (strlen(inst) > 0)
cli_mesg(inst);
xfree(name);
xfree(inst);
xfree(lang); /* unused */
xfree(lang);
num_prompts = packet_get_int();
/*
@ -967,7 +963,7 @@ authmethod_clear(void)
}
if (authname_current != NULL) {
xfree(authname_current);
authlist_state = NULL;
authname_current = NULL;
}
if (authlist_state != NULL)
authlist_state = NULL;