X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/7368a6c8e3b85e1167613855b328b04c29886fe8..f9e4952c0d45a2afdc9267c8cc9500462a82ad11:/mpaux.c

diff --git a/mpaux.c b/mpaux.c
index d37de0e9..0c486275 100644
--- a/mpaux.c
+++ b/mpaux.c
@@ -1,44 +1,38 @@
 /*
- * 
- * 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.
- * 
-*/
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: mpaux.c,v 1.16 2001/02/08 19:30:52 itojun Exp $");
 
+#include <openssl/bn.h>
 #include "getput.h"
 #include "xmalloc.h"
 
-#ifdef HAVE_OPENSSL
-#include <openssl/bn.h>
 #include <openssl/md5.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/bn.h>
-#include <ssl/md5.h>
-#endif
+
+#include "mpaux.h"
 
 void
-compute_session_id(unsigned char session_id[16],
-    unsigned char cookie[8],
+compute_session_id(u_char session_id[16],
+    u_char cookie[8],
     BIGNUM* host_key_n,
     BIGNUM* session_key_n)
 {
-	unsigned int host_key_bytes = BN_num_bytes(host_key_n);
-	unsigned int session_key_bytes = BN_num_bytes(session_key_n);
-	unsigned int bytes = host_key_bytes + session_key_bytes;
-	unsigned char *buf = xmalloc(bytes);
+	u_int host_key_bytes = BN_num_bytes(host_key_n);
+	u_int session_key_bytes = BN_num_bytes(session_key_n);
+	u_int bytes = host_key_bytes + session_key_bytes;
+	u_char *buf = xmalloc(bytes);
 	MD5_CTX md;
 
 	BN_bn2bin(host_key_n, buf);