- deraadt@cvs.openbsd.org 2001/02/04 16:56:23

[openssh.git] / sshd.c

diff --git a/sshd.c b/sshd.c
index 02fe2ec426885165c1b0eae6e51e637def373214..e329112992a418caf50f3e90beb6ec2fa97ab49c 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.159 2001/01/29 19:47:31 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -429,7 +429,7 @@ destroy_sensitive_data(void)
                key_free(sensitive_data.server_key);
                sensitive_data.server_key = NULL;
        }
-        for(i = 0; i < options.num_host_key_files; i++) {
+       for(i = 0; i < options.num_host_key_files; i++) {
                if (sensitive_data.host_keys[i]) {
                        key_free(sensitive_data.host_keys[i]);
                        sensitive_data.host_keys[i] = NULL;
@@ -723,7 +723,7 @@ main(int ac, char **av)
                log("Disabling protocol version 2. Could not load host key");
                options.protocol &= ~SSH_PROTO_2;
        }
-       if (! options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) {
+       if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
                log("sshd: no hostkeys available -- exiting.\n");
                exit(1);
        }
@@ -983,7 +983,7 @@ main(int ac, char **av)
                                                startups++;
                                                break;
                                        }
-                               
+
                                /*
                                 * Got connection.  Fork a child to handle it, unless
                                 * we are in debugging mode.
@@ -1348,7 +1348,7 @@ do_ssh1_kex(void)
                if (len < 0 || len > sizeof(session_key)) {
                        error("do_connection: bad session key len from %s: "
                            "session_key_int %d > sizeof(session_key) %d",
-                           get_remote_ipaddr(), len, sizeof(session_key));
+                           get_remote_ipaddr(), len, (int)sizeof(session_key));
                        rsafail++;
                } else {
                        memset(session_key, 0, sizeof(session_key));
@@ -1507,7 +1507,7 @@ ssh_dh1_server(Kex *kex, Buffer *client_kexinit, Buffer *server_kexinit)
        fprintf(stderr, "\npub= ");
        BN_print_fp(stderr, dh->pub_key);
        fprintf(stderr, "\n");
-        DHparams_print_fp(stderr, dh);
+       DHparams_print_fp(stderr, dh);
 #endif
        if (!dh_pub_is_valid(dh, dh_client_pub))
                packet_disconnect("bad client public DH value");
@@ -1650,7 +1650,7 @@ ssh_dhgex_server(Kex *kex, Buffer *client_kexinit, Buffer *server_kexinit)
        fprintf(stderr, "\npub= ");
        BN_print_fp(stderr, dh->pub_key);
        fprintf(stderr, "\n");
-        DHparams_print_fp(stderr, dh);
+       DHparams_print_fp(stderr, dh);
 #endif
        if (!dh_pub_is_valid(dh, dh_client_pub))
                packet_disconnect("bad client public DH value");