- (djm) CVS OpenBSD sync:

[openssh.git] / sshd.c

diff --git a/sshd.c b/sshd.c
index e94b5d11d75fa49989114e99362a432c50305651..ae22cd9530caa18e02bdb4b203656d410d74b79a 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.127 2000/09/12 20:53:10 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.128 2000/09/17 15:38:59 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -667,6 +667,10 @@ main(int ac, char **av)
                }
        }
 
+#ifdef HAVE_SCO_PROTECTED_PW
+       (void) set_auth_parameters(ac, av);
+#endif
+
        /* Initialize the log (it is reinitialized below in case we forked). */
        if (debug_flag && !inetd_flag)
                log_stderr = 1;
@@ -1259,7 +1263,7 @@ do_ssh1_kex()
        if (len < 0 || len > sizeof(session_key))
                fatal("do_connection: bad len from %s: session_key_int %d > sizeof(session_key) %d",
                      get_remote_ipaddr(),
-                     len, sizeof(session_key));
+                     len, (int) sizeof(session_key));
        memset(session_key, 0, sizeof(session_key));
        BN_bn2bin(session_key_int, session_key + sizeof(session_key) - len);
 
@@ -1336,7 +1340,7 @@ do_ssh2_kex()
 
 #ifdef DEBUG_KEXDH
        fprintf(stderr, "\ndh_client_pub= ");
-       bignum_print(dh_client_pub);
+       BN_print_fp(stderr, dh_client_pub);
        fprintf(stderr, "\n");
        debug("bits %d", BN_num_bits(dh_client_pub));
 #endif
@@ -1346,12 +1350,13 @@ do_ssh2_kex()
 
 #ifdef DEBUG_KEXDH
        fprintf(stderr, "\np= ");
-       bignum_print(dh->p);
+       BN_print_fp(stderr, dh->p);
        fprintf(stderr, "\ng= ");
-       bignum_print(dh->g);
+       bn_print(dh->g);
        fprintf(stderr, "\npub= ");
-       bignum_print(dh->pub_key);
+       BN_print_fp(stderr, dh->pub_key);
        fprintf(stderr, "\n");
+        DHparams_print_fp(stderr, dh);
 #endif
        if (!dh_pub_is_valid(dh, dh_client_pub))
                packet_disconnect("bad client public DH value");