]>
Commit | Line | Data |
---|---|---|
6216cfe4 JB |
1 | --- w3c-libwww-5.4.2/configure.ac.orig 2008-09-17 13:29:33.000000000 +0200 |
2 | +++ w3c-libwww-5.4.2/configure.ac 2008-09-17 13:47:03.000000000 +0200 | |
57a7d4ad PS |
3 | @@ -541,14 +541,14 @@ |
4 | AC_DEFINE(HT_MD5) | |
5 | WWWMD5="libmd5.la" | |
6 | LWWWMD5="-lmd5" | |
7 | - LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la' | |
6216cfe4 | 8 | + LIBWWWMD5='-lcrypto' |
57a7d4ad PS |
9 | ;; |
10 | esac ], | |
11 | AC_MSG_RESULT(yes) | |
12 | AC_DEFINE(HT_MD5) | |
13 | WWWMD5="libmd5.la" | |
14 | LWWWMD5="-lmd5" | |
15 | - LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la' | |
6216cfe4 | 16 | + LIBWWWMD5='-lcrypto' |
57a7d4ad PS |
17 | ) |
18 | AC_SUBST(WWWMD5) | |
19 | AC_SUBST(LWWWMD5) | |
6216cfe4 JB |
20 | --- w3c-libwww-5.4.2/Robot/src/Makefile.am.orig 2018-02-16 22:55:46.492032806 +0100 |
21 | +++ w3c-libwww-5.4.2/Robot/src/Makefile.am 2018-02-17 09:24:56.628268433 +0100 | |
22 | @@ -21,7 +21,7 @@ | |
57a7d4ad PS |
23 | $(top_builddir)/Library/src/libwwwcore.la \ |
24 | $(top_builddir)/Library/src/libwwwutils.la \ | |
6216cfe4 JB |
25 | -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ \ |
26 | - @LIBWWWSQL@ @LIBWWWMD5@ @LIBWWWSSL@ \ | |
27 | + @LIBWWWSQL@ @LIBWWWSSL@ \ | |
28 | $(MYSQL_LIBS) | |
57a7d4ad PS |
29 | |
30 | SUBDIRS = windows | |
6216cfe4 | 31 | @@ -71,8 +71,6 @@ |
57a7d4ad | 32 | $(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \ |
6216cfe4 | 33 | -lm \ |
57a7d4ad PS |
34 | ../../Library/src/.libs/libwww.a \ |
35 | - ../../modules/md5/.libs/libmd5.a \ | |
6216cfe4 | 36 | - ../../modules/expat/.libs/libexpat.a |
57a7d4ad PS |
37 | $(LIBS) |
38 | ||
39 | ||
6216cfe4 JB |
40 | --- w3c-libwww-5.4.2/Library/Examples/Makefile.am.orig 2017-06-24 07:51:37.000000000 +0200 |
41 | +++ w3c-libwww-5.4.2/Library/Examples/Makefile.am 2018-02-17 09:25:25.091601441 +0100 | |
57a7d4ad PS |
42 | @@ -28,7 +28,7 @@ |
43 | ../src/libwwwutils.la \ | |
44 | @LIBWWWDAV@ \ | |
45 | @LIBWWWSSL@ \ | |
46 | - -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ @LIBWWWMD5@ | |
47 | + -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ | |
48 | ||
6216cfe4 | 49 | AM_CPPFLAGS = \ |
57a7d4ad | 50 | -I$(srcdir)/../src \ |
6216cfe4 | 51 | @@ -67,8 +67,6 @@ |
57a7d4ad PS |
52 | ../src/.libs/libwwwutils.a \ |
53 | ../src/.libs/libwwwdav.a \ | |
54 | ../src/.libs/libwwwzip.a \ | |
55 | - ../../modules/md5/.libs/libmd5.a \ | |
6216cfe4 | 56 | - ../../modules/expat/.libs/libexpat.a |
57a7d4ad PS |
57 | $(LIBS) |
58 | ||
59 | ||
57a7d4ad PS |
60 | --- w3c-libwww-5.4.0/Library/src/HTDigest.h.orig 2002-06-12 11:31:20.000000000 +0200 |
61 | +++ w3c-libwww-5.4.0/Library/src/HTDigest.h 2008-09-17 13:42:22.000000000 +0200 | |
6216cfe4 JB |
62 | @@ -39,7 +39,7 @@ |
63 | /* Library include files */ | |
64 | #include "WWWLib.h" | |
65 | /* add the MD algorithm header files here below */ | |
66 | -#include "md5.h" | |
67 | +#include <openssl/md5.h> | |
68 | ||
69 | #ifdef __cplusplus | |
70 | extern "C" { | |
57a7d4ad PS |
71 | @@ -60,7 +60,7 @@ |
72 | typedef struct _HTDigestContext { | |
73 | int algorithm; | |
74 | union { | |
75 | - MD5_CTX md5; | |
6216cfe4 | 76 | + MD5_CTX md5; |
57a7d4ad PS |
77 | } context; |
78 | } HTDigestContext; | |
79 | ||
80 | --- w3c-libwww-5.4.0/Library/src/HTDigest.c.orig 1999-02-05 18:31:45.000000000 +0100 | |
81 | +++ w3c-libwww-5.4.0/Library/src/HTDigest.c 2008-09-17 13:44:19.000000000 +0200 | |
82 | @@ -29,7 +29,7 @@ | |
83 | ||
84 | switch (digesttype) { | |
85 | case HTDaMD5: | |
86 | - MD5Init (&context->context.md5); | |
6216cfe4 | 87 | + MD5_Init (&context->context.md5); |
57a7d4ad PS |
88 | break; |
89 | default: | |
90 | return NO; | |
91 | @@ -43,7 +43,7 @@ | |
92 | if (context) { | |
93 | switch (context->algorithm) { | |
94 | case HTDaMD5: | |
95 | - MD5Update (&context->context.md5, (unsigned char *) input, | |
6216cfe4 | 96 | + MD5_Update (&context->context.md5, (unsigned char *) input, |
57a7d4ad PS |
97 | inputLen); |
98 | break; | |
99 | default: | |
100 | @@ -60,7 +60,7 @@ | |
101 | if (context) { | |
102 | switch (context->algorithm) { | |
103 | case HTDaMD5: | |
104 | - MD5Final (digest, &context->context.md5); | |
6216cfe4 | 105 | + MD5_Final (&context->context.md5, digest); |
57a7d4ad PS |
106 | break; |
107 | default: | |
108 | return NO; | |
109 | --- w3c-libwww-5.4.0/modules/Makefile.am.orig 2008-09-17 14:10:11.000000000 +0200 | |
110 | +++ w3c-libwww-5.4.0/modules/Makefile.am 2008-09-17 14:27:10.000000000 +0200 | |
111 | @@ -5,5 +5,4 @@ | |
112 | EXTRA_DIST = \ | |
113 | $(DOCS) | |
114 | ||
115 | -SUBDIRS = md5 | |
116 | ||
6216cfe4 JB |
117 | --- w3c-libwww-5.4.2/Library/src/Makefile.am.orig 2018-02-17 22:22:57.834402083 +0100 |
118 | +++ w3c-libwww-5.4.2/Library/src/Makefile.am 2018-02-17 22:24:20.137734478 +0100 | |
119 | @@ -267,11 +267,7 @@ | |
23b91159 | 120 | HTPEP.c |
121 | ||
6216cfe4 | 122 | libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \ |
23b91159 | 123 | - ../../modules/md5/libmd5.la |
6216cfe4 JB |
124 | - |
125 | -libwwwhttp_la_CPPFLAGS = \ | |
126 | - -I/usr/local/include \ | |
127 | - -I${top_srcdir}/modules/md5 | |
128 | + @LIBWWWMD5@ | |
23b91159 | 129 | |
23b91159 | 130 | libwwwnews_la_SOURCES = \ |
131 | WWWNews.h \ | |
6216cfe4 JB |
132 | @@ -422,8 +418,6 @@ |
133 | libwwwsql_la_LIBADD = $(MYSQL_LIBS) | |
23b91159 | 134 | |
6216cfe4 | 135 | libwwwsql_la_CPPFLAGS = \ |
23b91159 | 136 | - -I/usr/local/include \ |
6216cfe4 JB |
137 | - -I${top_srcdir}/modules/md5 \ |
138 | $(MYSQL_CFLAGS) | |
139 | ||
23b91159 | 140 | BUILT_SOURCES = \ |