diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-18 02:04:35 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-18 02:04:35 +0000 |
commit | bf555ba6210532f8598ff0f96961e82bcda3f09b (patch) | |
tree | 2b90d1026f300a2dd478c654e5e47ada304c3ffe /sshconnect.c | |
parent | 01fa6380e815a37ac5ffcf03b04c93d7b52ce765 (diff) |
NOTE: This update changes the RSA key generation. *NEW RSA KEYS
NEED TO BE GENERATED* =) Refer to to entry "2001/01/16 19:20:06"
for more details.
20010118
- (bal) Super Sized OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/11 22:14:20 GMT 2001 by markus
[sshd.c]
maxfd+1
- markus@cvs.openbsd.org 2001/01/13 17:59:18
[ssh-keygen.1]
small ssh-keygen manpage cleanup; stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:03:07
[scp.c ssh-keygen.c sshd.c]
getopt() returns -1 not EOF; stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:06:54
[ssh-keyscan.c]
use SSH_DEFAULT_PORT; from stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:12:47
[ssh-keyscan.c]
free() -> xfree(); fix memory leak; from stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:14:13
[ssh-add.c]
typo, from stevesk@sweden.hp.com
- markus@cvs.openbsd.org 2001/01/13 18:32:50
[packet.c session.c ssh.c sshconnect.c sshd.c]
split out keepalive from packet_interactive (from dale@accentre.com)
set IPTOS_LOWDELAY TCP_NODELAY IPTOS_THROUGHPUT for ssh2, too.
- markus@cvs.openbsd.org 2001/01/13 18:36:45
[packet.c packet.h]
reorder, typo
- markus@cvs.openbsd.org 2001/01/13 18:38:00
[auth-options.c]
fix comment
- markus@cvs.openbsd.org 2001/01/13 18:43:31
[session.c]
Wall
- markus@cvs.openbsd.org 2001/01/13 19:14:08
[clientloop.h clientloop.c ssh.c]
move callback to headerfile
- markus@cvs.openbsd.org 2001/01/15 21:40:10
[ssh.c]
use log() instead of stderr
- markus@cvs.openbsd.org 2001/01/15 21:43:51
[dh.c]
use error() not stderr!
- markus@cvs.openbsd.org 2001/01/15 21:45:29
[sftp-server.c]
rename must fail if newpath exists, debug off by default
- markus@cvs.openbsd.org 2001/01/15 21:46:38
[sftp-server.c]
readable long listing for sftp-server, ok deraadt@
- markus@cvs.openbsd.org 2001/01/16 19:20:06
[key.c ssh-rsa.c]
make "ssh-rsa" key format for ssh2 confirm to the ietf-drafts; from
galb@vandyke.com. note that you have to delete older ssh2-rsa keys,
since they are in the wrong format, too. they must be removed from
.ssh/authorized_keys2 and .ssh/known_hosts2, etc.
(cd; grep -v ssh-rsa .ssh/authorized_keys2 > TMP && mv TMP
.ssh/authorized_keys2) additionally, we now check that
BN_num_bits(rsa->n) >= 768.
- markus@cvs.openbsd.org 2001/01/16 20:54:27
[sftp-server.c]
remove some statics. simpler handles; idea from nisse@lysator.liu.se
- deraadt@cvs.openbsd.org 2001/01/16 23:58:08
[bufaux.c radix.c sshconnect.h sshconnect1.c]
indent
- (bal) Added bsd-strmode.[ch] since some non-OpenBSD platforms may
be missing such feature.
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sshconnect.c b/sshconnect.c index 59b273a9c..e40ba984c 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.89 2001/01/04 22:41:03 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.90 2001/01/13 18:32:50 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/dsa.h> | 19 | #include <openssl/dsa.h> |
@@ -187,12 +187,13 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
187 | int anonymous, uid_t original_real_uid, | 187 | int anonymous, uid_t original_real_uid, |
188 | const char *proxy_command) | 188 | const char *proxy_command) |
189 | { | 189 | { |
190 | int gaierr; | ||
191 | int on = 1; | ||
190 | int sock = -1, attempt; | 192 | int sock = -1, attempt; |
191 | struct servent *sp; | ||
192 | struct addrinfo hints, *ai, *aitop; | ||
193 | char ntop[NI_MAXHOST], strport[NI_MAXSERV]; | 193 | char ntop[NI_MAXHOST], strport[NI_MAXSERV]; |
194 | int gaierr; | 194 | struct addrinfo hints, *ai, *aitop; |
195 | struct linger linger; | 195 | struct linger linger; |
196 | struct servent *sp; | ||
196 | 197 | ||
197 | debug("ssh_connect: getuid %u geteuid %u anon %d", | 198 | debug("ssh_connect: getuid %u geteuid %u anon %d", |
198 | (u_int) getuid(), (u_int) geteuid(), anonymous); | 199 | (u_int) getuid(), (u_int) geteuid(), anonymous); |
@@ -298,7 +299,13 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
298 | /* setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)); */ | 299 | /* setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)); */ |
299 | linger.l_onoff = 1; | 300 | linger.l_onoff = 1; |
300 | linger.l_linger = 5; | 301 | linger.l_linger = 5; |
301 | setsockopt(sock, SOL_SOCKET, SO_LINGER, (void *) &linger, sizeof(linger)); | 302 | setsockopt(sock, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger)); |
303 | |||
304 | /* Set keepalives if requested. */ | ||
305 | if (options.keepalives && | ||
306 | setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, | ||
307 | sizeof(on)) < 0) | ||
308 | error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno)); | ||
302 | 309 | ||
303 | /* Set the connection. */ | 310 | /* Set the connection. */ |
304 | packet_set_connection(sock, sock); | 311 | packet_set_connection(sock, sock); |