[svn] Use Solaris's libmd5 when available.

[wget] / src / ftp-opie.c

diff --git a/src/ftp-opie.c b/src/ftp-opie.c
index c664ae0226d32ac4eacb730c05557a8876c3987c..c9c7d2b9b9b2f7654df4497ea3971df9bf35a7c4 100644 (file)
--- a/src/ftp-opie.c
+++ b/src/ftp-opie.c
@@ -28,7 +28,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 
 #include "wget.h"
-#include "md5.h"
 
 /* Dictionary for integer-word translations.  */
 static char Wp[2048][4] = {
@@ -2152,16 +2151,16 @@ calculate_skey_response (int sequence, const char *seed, const char *pass)
   char key[8];
   static char buf[33];
 
-  struct md5_ctx ctx;
+  MD5_CONTEXT_TYPE ctx;
   unsigned long results[4];    /* #### this looks 32-bit-minded */
   char *feed = (char *) alloca (strlen (seed) + strlen (pass) + 1);
 
   strcpy (feed, seed);
   strcat (feed, pass);
 
-  md5_init_ctx (&ctx);
-  md5_process_bytes (feed, strlen (feed), &ctx);
-  md5_finish_ctx (&ctx, results);
+  MD5_INIT (&ctx);
+  MD5_UPDATE (feed, strlen (feed), &ctx);
+  MD5_FINISH (&ctx, results);
 
   results[0] ^= results[2];
   results[1] ^= results[3];
@@ -2169,9 +2168,9 @@ calculate_skey_response (int sequence, const char *seed, const char *pass)
 
   while (0 < sequence--)
     {
-      md5_init_ctx (&ctx);
-      md5_process_bytes (key, 8, &ctx);
-      md5_finish_ctx (&ctx, results);
+      MD5_INIT (&ctx);
+      MD5_UPDATE (key, 8, &ctx);
+      MD5_FINISH (&ctx, results);
       results[0] ^= results[2];
       results[1] ^= results[3];
       memcpy (key, (char *) results, 8);