[svn] Use new macros xnew, xnew0, xnew_array, and xnew0_array in various places.

[wget] / src / ftp-opie.c

diff --git a/src/ftp-opie.c b/src/ftp-opie.c
index c9c7d2b9b9b2f7654df4497ea3971df9bf35a7c4..2ea295e4fab9e6c673ec674fdc442c594b7b4b94 100644 (file)
--- a/src/ftp-opie.c
+++ b/src/ftp-opie.c
@@ -15,7 +15,17 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #include <config.h>
 
@@ -28,6 +38,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 
 #include "wget.h"
+#include "gen-md5.h"
 
 /* Dictionary for integer-word translations.  */
 static char Wp[2048][4] = {
@@ -2113,7 +2124,7 @@ btoe (char *store, const char *c)
 
   *store = '\0';
   /* Workaround for extract() reads beyond end of data */
-  memset (cp, 0, sizeof(cp));
+  xzero (cp);
   memcpy (cp, c, 8);
   /* Compute parity.  */
   for (p = 0, i = 0; i < 64; i += 2)
@@ -2151,16 +2162,16 @@ calculate_skey_response (int sequence, const char *seed, const char *pass)
   char key[8];
   static char buf[33];
 
-  MD5_CONTEXT_TYPE ctx;
+  ALLOCA_MD5_CONTEXT (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);
-  MD5_UPDATE (feed, strlen (feed), &ctx);
-  MD5_FINISH (&ctx, results);
+  gen_md5_init (ctx);
+  gen_md5_update ((unsigned char *)feed, strlen (feed), ctx);
+  gen_md5_finish (ctx, (unsigned char *)results);
 
   results[0] ^= results[2];
   results[1] ^= results[3];
@@ -2168,9 +2179,9 @@ calculate_skey_response (int sequence, const char *seed, const char *pass)
 
   while (0 < sequence--)
     {
-      MD5_INIT (&ctx);
-      MD5_UPDATE (key, 8, &ctx);
-      MD5_FINISH (&ctx, results);
+      gen_md5_init (ctx);
+      gen_md5_update ((unsigned char *)key, 8, ctx);
+      gen_md5_finish (ctx, (unsigned char *)results);
       results[0] ^= results[2];
       results[1] ^= results[3];
       memcpy (key, (char *) results, 8);