X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fftp-opie.c;h=9b3761016868e00618bf4ed4e89d34ed23ecd9c6;hb=b718128b4f3eb8473fb3b31c8397b49854e74ab7;hp=d5331ce155db416236e044ead051cf6485083e7a;hpb=db9de5b07563e2f5d1e14a92f2cda4137cc2fb8a;p=wget
diff --git a/src/ftp-opie.c b/src/ftp-opie.c
index d5331ce1..9b376101 100644
--- a/src/ftp-opie.c
+++ b/src/ftp-opie.c
@@ -1,11 +1,12 @@
/* Opie (s/key) support for FTP.
- Copyright (C) 1998-2004 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Wget.
GNU Wget is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
GNU Wget is distributed in the hope that it will be useful,
@@ -14,27 +15,26 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+along with Wget. If not, see .
-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. */
+Additional permission under GNU GPL version 3 section 7
-#include
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work. */
+
+#include "wget.h"
#include
#include
#include
-#include "wget.h"
-#include "gen-md5.h"
+#include "md5.h"
#include "ftp.h"
/* Dictionary for integer-word translations. Available in appendix D
@@ -2118,8 +2118,8 @@ extract (const unsigned char *s, int start, int length)
static char *
btoe (char *store, const unsigned char *c)
{
- unsigned char cp[10]; /* add in room for the parity 2 bits +
- extract() slop. */
+ unsigned char cp[10]; /* add in room for the parity 2 bits +
+ extract() slop. */
int p, i;
char *store_beg = store;
@@ -2155,9 +2155,9 @@ btoe (char *store, const unsigned char *c)
store += STRLEN_1_4 (store);
*store++ = ' ';
memcpy (store, &Wp[extract (cp, 55, 11)][0], 4);
- store[4] = '\0'; /* make sure the string is terminated */
+ store[4] = '\0'; /* make sure the string is terminated */
- DEBUGP (("wrote `%s' to STORE\n", store_beg));
+ DEBUGP (("wrote %s to STORE\n", quote (store_beg)));
return store_beg;
}
@@ -2196,22 +2196,22 @@ skey_response (int sequence, const char *seed, const char *pass)
the terminating \0. 24+5+1 == 30 */
static char english[30];
- ALLOCA_MD5_CONTEXT (md5_ctx);
+ struct md5_ctx ctx;
uint32_t checksum[4];
- gen_md5_init (md5_ctx);
- gen_md5_update ((const unsigned char *)seed, strlen(seed), md5_ctx);
- gen_md5_update ((const unsigned char *)pass, strlen(pass), md5_ctx);
- gen_md5_finish (md5_ctx, (unsigned char *)checksum);
+ md5_init_ctx (&ctx);
+ md5_process_bytes ((const unsigned char *) seed, strlen (seed), &ctx);
+ md5_process_bytes ((const unsigned char *) pass, strlen (pass), &ctx);
+ md5_finish_ctx (&ctx, (unsigned char *) checksum);
checksum[0] ^= checksum[2];
checksum[1] ^= checksum[3];
memcpy (key, checksum, 8);
while (sequence-- > 0)
{
- gen_md5_init (md5_ctx);
- gen_md5_update ((unsigned char *) key, 8, md5_ctx);
- gen_md5_finish (md5_ctx, (unsigned char *) checksum);
+ md5_init_ctx (&ctx);
+ md5_process_bytes ((unsigned char *) key, 8, &ctx);
+ md5_finish_ctx (&ctx, (unsigned char *) checksum);
checksum[0] ^= checksum[2];
checksum[1] ^= checksum[3];
memcpy (key, checksum, 8);