diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-05 23:26:32 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-05 23:26:32 +0000 |
commit | a3700050ec681277bcdf76a02b0c2e304ff317c7 (patch) | |
tree | 6cd727ebf611f03b345783cb9d6d8d04e8f483bf /sshd.c | |
parent | a6c20148f58e34a902512ffe5eee3279acaaa26b (diff) |
- markus@cvs.openbsd.org 2001/04/05 10:42:57
[auth-chall.c authfd.c channels.c clientloop.c kex.c kexgex.c key.c
mac.c packet.c serverloop.c sftp-client.c sftp-client.h sftp-glob.c
sftp-glob.h sftp-int.c sftp-server.c sftp.c ssh-keygen.c sshconnect.c
sshconnect2.c sshd.c]
fix whitespace: unexpand + trailing spaces.
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.190 2001/04/04 20:25:38 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.191 2001/04/05 10:42:57 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -282,11 +282,11 @@ generate_ephemeral_server_key(void) | |||
282 | u_int32_t rand = 0; | 282 | u_int32_t rand = 0; |
283 | int i; | 283 | int i; |
284 | 284 | ||
285 | verbose("Generating %s%d bit RSA key.", | 285 | verbose("Generating %s%d bit RSA key.", |
286 | sensitive_data.server_key ? "new " : "", options.server_key_bits); | 286 | sensitive_data.server_key ? "new " : "", options.server_key_bits); |
287 | if (sensitive_data.server_key != NULL) | 287 | if (sensitive_data.server_key != NULL) |
288 | key_free(sensitive_data.server_key); | 288 | key_free(sensitive_data.server_key); |
289 | sensitive_data.server_key = key_generate(KEY_RSA1, | 289 | sensitive_data.server_key = key_generate(KEY_RSA1, |
290 | options.server_key_bits); | 290 | options.server_key_bits); |
291 | verbose("RSA key generation complete."); | 291 | verbose("RSA key generation complete."); |
292 | 292 | ||
@@ -341,7 +341,7 @@ sshd_exchange_identification(int sock_in, int sock_out) | |||
341 | } | 341 | } |
342 | 342 | ||
343 | /* Read other side's version identification. */ | 343 | /* Read other side's version identification. */ |
344 | memset(buf, 0, sizeof(buf)); | 344 | memset(buf, 0, sizeof(buf)); |
345 | for (i = 0; i < sizeof(buf) - 1; i++) { | 345 | for (i = 0; i < sizeof(buf) - 1; i++) { |
346 | if (atomicio(read, sock_in, &buf[i], 1) != 1) { | 346 | if (atomicio(read, sock_in, &buf[i], 1) != 1) { |
347 | log("Did not receive identification string from %s.", | 347 | log("Did not receive identification string from %s.", |