- Merged very large OpenBSD source code reformat

 - OpenBSD CVS updates
   - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
     [ssh.h sshd.8 sshd.c]
     syslog changes:
     * Unified Logmessage for all auth-types, for success and for failed
     * Standard connections get only ONE line in the LOG when level==LOG:
       Auth-attempts are logged only, if authentication is:
          a) successfull or
          b) with passwd or
          c) we had more than AUTH_FAIL_LOG failues
     * many log() became verbose()
     * old behaviour with level=VERBOSE
   - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
     tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
     messages. allows use of s/key in windows (ttssh, securecrt) and
     ssh-1.2.27 clients without 'ssh -v', ok: niels@
   - [sshd.8]
     -V, for fallback to openssh in SSH2 compatibility mode
   - [sshd.c]
     fix sigchld race; cjc5@po.cwru.edu

1 files changed, 33 insertions, 35 deletions

diff --git a/mpaux.c b/mpaux.c
index 378fd90da..7bc7c13b8 100644
--- a/mpaux.c
+++ b/mpaux.c
@@ -1,21 +1,24 @@
 /*
-
-mpaux.c
-
-Author: Tatu Ylonen <ylo@cs.hut.fi>
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-                   All rights reserved
-
-Created: Sun Jul 16 04:29:30 1995 ylo
-
-This file contains various auxiliary functions related to multiple
-precision integers.
-
+ * 
+ * mpaux.c
+ * 
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * 
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ * 
+ * Created: Sun Jul 16 04:29:30 1995 ylo
+ * 
+ * This file contains various auxiliary functions related to multiple
+ * precision integers.
+ * 
 */
 
 #include "includes.h"
-RCSID("$Id: mpaux.c,v 1.6 1999/11/16 02:37:16 damien Exp $");
+RCSID("$Id: mpaux.c,v 1.7 1999/11/24 13:26:22 damien Exp $");
+
+#include "getput.h"
+#include "xmalloc.h"
 
 #ifdef HAVE_OPENSSL
 #include <openssl/bn.h>
@@ -26,29 +29,24 @@ RCSID("$Id: mpaux.c,v 1.6 1999/11/16 02:37:16 damien Exp $");
 #include <ssl/md5.h>
 #endif
 
-#include "getput.h"
-#include "xmalloc.h"
-
-
 void
 compute_session_id(unsigned char session_id[16],
                    unsigned char cookie[8],
-                   BIGNUM *host_key_n,
-                   BIGNUM *session_key_n)
+                   BIGNUM* host_key_n,
+                   BIGNUM* session_key_n)
 {
-  unsigned int host_key_bits = BN_num_bits(host_key_n);
-  unsigned int session_key_bits = BN_num_bits(session_key_n);
-  unsigned int bytes = (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8 + 8;
-  unsigned char *buf = xmalloc(bytes);
-  MD5_CTX md;
-
-  BN_bn2bin(host_key_n, buf);
-  BN_bn2bin(session_key_n, buf + (host_key_bits + 7 ) / 8);
-  memcpy(buf + (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8,
-         cookie, 8);
-  MD5_Init(&md);
-  MD5_Update(&md, buf, bytes);
-  MD5_Final(session_id, &md);
-  memset(buf, 0, bytes);
-  xfree(buf);
+        unsigned int host_key_bits = BN_num_bits(host_key_n);
+        unsigned int session_key_bits = BN_num_bits(session_key_n);
+        unsigned int bytes = (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8 + 8;
+        unsigned char *buf = xmalloc(bytes);
+        MD5_CTX md;
+
+        BN_bn2bin(host_key_n, buf);
+        BN_bn2bin(session_key_n, buf + (host_key_bits + 7) / 8);
+        memcpy(buf + (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8, cookie, 8);
+        MD5_Init(&md);
+        MD5_Update(&md, buf, bytes);
+        MD5_Final(session_id, &md);
+        memset(buf, 0, bytes);
+        xfree(buf);
 }