diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
commit | 874d77bb134a21a5cf625956b60173376a993ba8 (patch) | |
tree | 93dd73b2ff1fbf0ad5f3978a2c4e0d8438a0bf7c /ssh.c | |
parent | 89d9796fbedef4eed6956a2c095c7cc25330c28d (diff) |
- (djm) Big OpenBSD sync:
- markus@cvs.openbsd.org 2000/09/30 10:27:44
[log.c]
allow loglevel debug
- markus@cvs.openbsd.org 2000/10/03 11:59:57
[packet.c]
hmac->mac
- markus@cvs.openbsd.org 2000/10/03 12:03:03
[auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c]
move fake-auth from auth1.c to individual auth methods, disables s/key in
debug-msg
- markus@cvs.openbsd.org 2000/10/03 12:16:48
ssh.c
do not resolve canonname, i have no idea why this was added oin ossh
- markus@cvs.openbsd.org 2000/10/09 15:30:44
ssh-keygen.1 ssh-keygen.c
-X now reads private ssh.com DSA keys, too.
- markus@cvs.openbsd.org 2000/10/09 15:32:34
auth-options.c
clear options on every call.
- markus@cvs.openbsd.org 2000/10/09 15:51:00
authfd.c authfd.h
interop with ssh-agent2, from <res@shore.net>
- markus@cvs.openbsd.org 2000/10/10 14:20:45
compat.c
use rexexp for version string matching
- provos@cvs.openbsd.org 2000/10/10 22:02:18
[kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h]
First rough implementation of the diffie-hellman group exchange. The
client can ask the server for bigger groups to perform the diffie-hellman
in, thus increasing the attack complexity when using ciphers with longer
keys. University of Windsor provided network, T the company.
- markus@cvs.openbsd.org 2000/10/11 13:59:52
[auth-rsa.c auth2.c]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:00:27
[auth-options.h]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:03:27
[scp.1 scp.c]
support 'scp -o' with help from mouring@pconline.com
- markus@cvs.openbsd.org 2000/10/11 14:11:35
[dh.c]
Wall
- markus@cvs.openbsd.org 2000/10/11 14:14:40
[auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h]
[ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h]
add support for s/key (kbd-interactive) to ssh2, based on work by
mkiernan@avantgo.com and me
- markus@cvs.openbsd.org 2000/10/11 14:27:24
[auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h]
[myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c]
[sshconnect2.c sshd.c]
new cipher framework
- markus@cvs.openbsd.org 2000/10/11 14:45:21
[cipher.c]
remove DES
- markus@cvs.openbsd.org 2000/10/12 03:59:20
[cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c]
enable DES in SSH-1 clients only
- markus@cvs.openbsd.org 2000/10/12 08:21:13
[kex.h packet.c]
remove unused
- markus@cvs.openbsd.org 2000/10/13 12:34:46
[sshd.c]
Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se
- markus@cvs.openbsd.org 2000/10/13 12:59:15
[cipher.c cipher.h myproposal.h rijndael.c rijndael.h]
rijndael/aes support
- markus@cvs.openbsd.org 2000/10/13 13:10:54
[sshd.8]
more info about -V
- markus@cvs.openbsd.org 2000/10/13 13:12:02
[myproposal.h]
prefer no compression
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 23 |
1 files changed, 4 insertions, 19 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.66 2000/09/12 20:53:10 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.68 2000/10/11 20:27:24 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/dsa.h> | 45 | #include <openssl/dsa.h> |
@@ -425,11 +425,12 @@ main(int ac, char **av) | |||
425 | options.cipher = SSH_CIPHER_ILLEGAL; | 425 | options.cipher = SSH_CIPHER_ILLEGAL; |
426 | } else { | 426 | } else { |
427 | /* SSH1 only */ | 427 | /* SSH1 only */ |
428 | options.cipher = cipher_number(optarg); | 428 | Cipher *c = cipher_by_name(optarg); |
429 | if (options.cipher == -1) { | 429 | if (c == NULL || c->number < 0) { |
430 | fprintf(stderr, "Unknown cipher type '%s'\n", optarg); | 430 | fprintf(stderr, "Unknown cipher type '%s'\n", optarg); |
431 | exit(1); | 431 | exit(1); |
432 | } | 432 | } |
433 | options.cipher = c->number; | ||
433 | } | 434 | } |
434 | break; | 435 | break; |
435 | case 'p': | 436 | case 'p': |
@@ -582,22 +583,6 @@ main(int ac, char **av) | |||
582 | if (options.hostname != NULL) | 583 | if (options.hostname != NULL) |
583 | host = options.hostname; | 584 | host = options.hostname; |
584 | 585 | ||
585 | /* Find canonic host name. */ | ||
586 | if (strchr(host, '.') == 0) { | ||
587 | struct addrinfo hints; | ||
588 | struct addrinfo *ai = NULL; | ||
589 | int errgai; | ||
590 | memset(&hints, 0, sizeof(hints)); | ||
591 | hints.ai_family = IPv4or6; | ||
592 | hints.ai_flags = AI_CANONNAME; | ||
593 | hints.ai_socktype = SOCK_STREAM; | ||
594 | errgai = getaddrinfo(host, NULL, &hints, &ai); | ||
595 | if (errgai == 0) { | ||
596 | if (ai->ai_canonname != NULL) | ||
597 | host = xstrdup(ai->ai_canonname); | ||
598 | freeaddrinfo(ai); | ||
599 | } | ||
600 | } | ||
601 | /* Disable rhosts authentication if not running as root. */ | 586 | /* Disable rhosts authentication if not running as root. */ |
602 | #ifdef HAVE_CYGWIN | 587 | #ifdef HAVE_CYGWIN |
603 | /* Ignore uid if running under Windows */ | 588 | /* Ignore uid if running under Windows */ |