use libssl md5 routines

5 files changed, 28 insertions, 28 deletions

diff --git a/usr.bin/ssh/auth-rsa.c b/usr.bin/ssh/auth-rsa.c
index 23fb0555a1c..2de81c8d242 100644
--- a/usr.bin/ssh/auth-rsa.c
+++ b/usr.bin/ssh/auth-rsa.c
@@ -16,7 +16,7 @@ validity of the host key.
 */
 
 #include "includes.h"
-RCSID("$Id: auth-rsa.c,v 1.5 1999/10/18 01:54:18 provos Exp $");
+RCSID("$Id: auth-rsa.c,v 1.6 1999/10/27 16:37:45 deraadt Exp $");
 
 #include "rsa.h"
 #include "packet.h"
@@ -26,7 +26,7 @@ RCSID("$Id: auth-rsa.c,v 1.5 1999/10/18 01:54:18 provos Exp $");
 #include "uidswap.h"
 
 #include <ssl/rsa.h>
-#include <md5.h>
+#include <ssl/md5.h>
 
 /* Flags that may be set in authorized_keys options. */
 extern int no_port_forwarding_flag;
@@ -94,10 +94,10 @@ auth_rsa_challenge_dialog(unsigned int bits, BIGNUM *e, BIGNUM *n)
   assert(len <= 32 && len);
   memset(buf, 0, 32);
   BN_bn2bin(challenge, buf + 32 - len);
-  MD5Init(&md);
-  MD5Update(&md, buf, 32);
-  MD5Update(&md, session_id, 16);
-  MD5Final(mdbuf, &md);
+  MD5_Init(&md);
+  MD5_Update(&md, buf, 32);
+  MD5_Update(&md, session_id, 16);
+  MD5_Final(mdbuf, &md);
 
   /* We will no longer need these. */
   BN_clear_free(encrypted_challenge);
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c
index b9956c03807..2de0351d022 100644
--- a/usr.bin/ssh/cipher.c
+++ b/usr.bin/ssh/cipher.c
@@ -12,12 +12,12 @@ Created: Wed Apr 19 17:41:39 1995 ylo
 */
 
 #include "includes.h"
-RCSID("$Id: cipher.c,v 1.11 1999/09/30 22:12:16 provos Exp $");
+RCSID("$Id: cipher.c,v 1.12 1999/10/27 16:37:45 deraadt Exp $");
 
 #include "ssh.h"
 #include "cipher.h"
 
-#include <md5.h>
+#include <ssl/md5.h>
 
 /*
  * What kind of tripple DES are these 2 routines?
@@ -178,9 +178,9 @@ void cipher_set_key_string(CipherContext *context, int cipher,
   MD5_CTX md;
   unsigned char digest[16];
   
-  MD5Init(&md);
-  MD5Update(&md, (const unsigned char *)passphrase, strlen(passphrase));
-  MD5Final(digest, &md);
+  MD5_Init(&md);
+  MD5_Update(&md, (const unsigned char *)passphrase, strlen(passphrase));
+  MD5_Final(digest, &md);
 
   cipher_set_key(context, cipher, digest, 16, for_encryption);
   
diff --git a/usr.bin/ssh/mpaux.c b/usr.bin/ssh/mpaux.c
index 6b02ca2f2a9..9dfa40bdd09 100644
--- a/usr.bin/ssh/mpaux.c
+++ b/usr.bin/ssh/mpaux.c
@@ -15,13 +15,13 @@ precision integers.
 */
 
 #include "includes.h"
-RCSID("$Id: mpaux.c,v 1.3 1999/09/30 17:08:52 deraadt Exp $");
+RCSID("$Id: mpaux.c,v 1.4 1999/10/27 16:37:45 deraadt Exp $");
 
 #include <ssl/bn.h>
 #include "getput.h"
 #include "xmalloc.h"
 
-#include <md5.h>
+#include <ssl/md5.h>
 
 void
 compute_session_id(unsigned char session_id[16],
@@ -39,8 +39,8 @@ compute_session_id(unsigned char session_id[16],
   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);
-  MD5Init(&md);
-  MD5Update(&md, buf, bytes);
-  MD5Final(session_id, &md);
+  MD5_Init(&md);
+  MD5_Update(&md, buf, bytes);
+  MD5_Final(session_id, &md);
   xfree(buf);
 }
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 9d2ad675e53..2d33bc1c804 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -14,7 +14,7 @@ The authentication agent program.
 */
 
 #include "includes.h"
-RCSID("$Id: ssh-agent.c,v 1.12 1999/10/14 18:17:42 markus Exp $");
+RCSID("$Id: ssh-agent.c,v 1.13 1999/10/27 16:37:45 deraadt Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -26,7 +26,7 @@ RCSID("$Id: ssh-agent.c,v 1.12 1999/10/14 18:17:42 markus Exp $");
 #include "getput.h"
 #include "mpaux.h"
 
-#include <md5.h>
+#include <ssl/md5.h>
 
 typedef struct
 {
@@ -132,10 +132,10 @@ process_authentication_challenge(SocketEntry *e)
 	    assert(len <= 32 && len);
 	    memset(buf, 0, 32);
 	    BN_bn2bin(challenge, buf + 32 - len);
-	    MD5Init(&md);
-	    MD5Update(&md, buf, 32);
-	    MD5Update(&md, session_id, 16);
-	    MD5Final(mdbuf, &md);
+	    MD5_Init(&md);
+	    MD5_Update(&md, buf, 32);
+	    MD5_Update(&md, session_id, 16);
+	    MD5_Final(mdbuf, &md);
 	    break;
 
 	  default:
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index 9ec78a12095..6ec8c4abfe9 100644
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -15,7 +15,7 @@ login (authentication) dialog.
 */
 
 #include "includes.h"
-RCSID("$Id: sshconnect.c,v 1.23 1999/10/25 20:34:30 markus Exp $");
+RCSID("$Id: sshconnect.c,v 1.24 1999/10/27 16:37:46 deraadt Exp $");
 
 #include <ssl/bn.h>
 #include "xmalloc.h"
@@ -28,7 +28,7 @@ RCSID("$Id: sshconnect.c,v 1.23 1999/10/25 20:34:30 markus Exp $");
 #include "uidswap.h"
 #include "compat.h"
 
-#include <md5.h>
+#include <ssl/md5.h>
 
 /* Session id for the current session. */
 unsigned char session_id[16];
@@ -452,10 +452,10 @@ respond_to_rsa_challenge(BIGNUM *challenge, RSA *prv)
   assert(len <= sizeof(buf) && len);
   memset(buf, 0, sizeof(buf));
   BN_bn2bin(challenge, buf + sizeof(buf) - len);
-  MD5Init(&md);
-  MD5Update(&md, buf, 32);
-  MD5Update(&md, session_id, 16);
-  MD5Final(response, &md);
+  MD5_Init(&md);
+  MD5_Update(&md, buf, 32);
+  MD5_Update(&md, session_id, 16);
+  MD5_Final(response, &md);
   
   debug("Sending response to host key RSA challenge.");