mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-24 21:01:20 +00:00
Code Issues Releases Activity

Fix neon authentification. The patch in external/neon

Browse Source 
is missing two unsigned chars.

http://www.openoffice.org/issues/show_bug.cgi?id=4818
This commit is contained in:
Martin Blapp 2002-08-08 20:52:02 +00:00
parent d6ff9b70c7
commit b933b77e57
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=64258
12 changed files with 732 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
editors/openoffice-1.0/files/patch-external+neon+md5.c.pat Normal file
View File

@ -0,0 +1,112 @@
--- /dev/null Thu Aug 8 22:39:51 2002
+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002
@@ -0,0 +1,109 @@
+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001
+--- sub\md5.c Tue May 08 12:52:02 2001
+***************
+*** 278,290 ****
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const md5_uint32 *words = buffer;
+! size_t nwords = len / sizeof (md5_uint32);
+! const md5_uint32 *endp = words + nwords;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+--- 278,289 ----
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const unsigned char *words = buffer;
+! const unsigned char *endp = words + len;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+***************
+*** 313,324 ****
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+! ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+--- 312,325 ----
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \
+! | (words[2] << 16) | (words[3] << 24); \
+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \
+! words += 4; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+***************
+*** 431,441 ****
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+--- 432,442 ----
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+***************
+*** 443,453 ****
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);
+--- 444,454 ----
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);

17
editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh
View File

@ -1,11 +1,14 @@
--- ../external/neon/neonpatch.sh.orig Mon Apr 15 15:22:48 2002
+++ ../external/neon/neonpatch.sh Mon Apr 15 15:22:54 2002
@@ -121,7 +121,7 @@
--- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001
+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002
@@ -119,10 +119,7 @@
# apply the patches
#
for PNAME in `cat flist.pat`
do
- for PNAME in `cat flist.pat`
- do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
+ patch < pat/$PNAME.pat rtufiles/$PNAME
done
- done
+ patch < md5.c.pat rtufiles/md5.c
#
# copy the SD files into rtufiles directory

112
editors/openoffice-1.0/files/patch-external::neon::md5.c.pat Normal file
View File

@ -0,0 +1,112 @@
--- /dev/null Thu Aug 8 22:39:51 2002
+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002
@@ -0,0 +1,109 @@
+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001
+--- sub\md5.c Tue May 08 12:52:02 2001
+***************
+*** 278,290 ****
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const md5_uint32 *words = buffer;
+! size_t nwords = len / sizeof (md5_uint32);
+! const md5_uint32 *endp = words + nwords;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+--- 278,289 ----
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const unsigned char *words = buffer;
+! const unsigned char *endp = words + len;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+***************
+*** 313,324 ****
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+! ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+--- 312,325 ----
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \
+! | (words[2] << 16) | (words[3] << 24); \
+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \
+! words += 4; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+***************
+*** 431,441 ****
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+--- 432,442 ----
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+***************
+*** 443,453 ****
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);
+--- 444,454 ----
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);

17
editors/openoffice-1.0/files/patch-external::neon::neonpatch.sh
View File

@ -1,11 +1,14 @@
--- ../external/neon/neonpatch.sh.orig Mon Apr 15 15:22:48 2002
+++ ../external/neon/neonpatch.sh Mon Apr 15 15:22:54 2002
@@ -121,7 +121,7 @@
--- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001
+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002
@@ -119,10 +119,7 @@
# apply the patches
#
for PNAME in `cat flist.pat`
do
- for PNAME in `cat flist.pat`
- do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
+ patch < pat/$PNAME.pat rtufiles/$PNAME
done
- done
+ patch < md5.c.pat rtufiles/md5.c
#
# copy the SD files into rtufiles directory

112
editors/openoffice.org-1.0/files/patch-external+neon+md5.c.pat Normal file
View File

@ -0,0 +1,112 @@
--- /dev/null Thu Aug 8 22:39:51 2002
+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002
@@ -0,0 +1,109 @@
+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001
+--- sub\md5.c Tue May 08 12:52:02 2001
+***************
+*** 278,290 ****
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const md5_uint32 *words = buffer;
+! size_t nwords = len / sizeof (md5_uint32);
+! const md5_uint32 *endp = words + nwords;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+--- 278,289 ----
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const unsigned char *words = buffer;
+! const unsigned char *endp = words + len;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+***************
+*** 313,324 ****
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+! ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+--- 312,325 ----
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \
+! | (words[2] << 16) | (words[3] << 24); \
+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \
+! words += 4; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+***************
+*** 431,441 ****
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+--- 432,442 ----
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+***************
+*** 443,453 ****
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);
+--- 444,454 ----
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);

17
editors/openoffice.org-1.0/files/patch-external+neon+neonpatch.sh
View File

@ -1,11 +1,14 @@
--- ../external/neon/neonpatch.sh.orig Mon Apr 15 15:22:48 2002
+++ ../external/neon/neonpatch.sh Mon Apr 15 15:22:54 2002
@@ -121,7 +121,7 @@
--- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001
+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002
@@ -119,10 +119,7 @@
# apply the patches
#
for PNAME in `cat flist.pat`
do
- for PNAME in `cat flist.pat`
- do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
+ patch < pat/$PNAME.pat rtufiles/$PNAME
done
- done
+ patch < md5.c.pat rtufiles/md5.c
#
# copy the SD files into rtufiles directory

112
editors/openoffice.org-1.0/files/patch-external::neon::md5.c.pat Normal file
View File

@ -0,0 +1,112 @@
--- /dev/null Thu Aug 8 22:39:51 2002
+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002
@@ -0,0 +1,109 @@
+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001
+--- sub\md5.c Tue May 08 12:52:02 2001
+***************
+*** 278,290 ****
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const md5_uint32 *words = buffer;
+! size_t nwords = len / sizeof (md5_uint32);
+! const md5_uint32 *endp = words + nwords;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+--- 278,289 ----
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const unsigned char *words = buffer;
+! const unsigned char *endp = words + len;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+***************
+*** 313,324 ****
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+! ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+--- 312,325 ----
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \
+! | (words[2] << 16) | (words[3] << 24); \
+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \
+! words += 4; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+***************
+*** 431,441 ****
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+--- 432,442 ----
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+***************
+*** 443,453 ****
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);
+--- 444,454 ----
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);

17
editors/openoffice.org-1.0/files/patch-external::neon::neonpatch.sh
View File

@ -1,11 +1,14 @@
--- ../external/neon/neonpatch.sh.orig Mon Apr 15 15:22:48 2002
+++ ../external/neon/neonpatch.sh Mon Apr 15 15:22:54 2002
@@ -121,7 +121,7 @@
--- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001
+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002
@@ -119,10 +119,7 @@
# apply the patches
#
for PNAME in `cat flist.pat`
do
- for PNAME in `cat flist.pat`
- do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
+ patch < pat/$PNAME.pat rtufiles/$PNAME
done
- done
+ patch < md5.c.pat rtufiles/md5.c
#
# copy the SD files into rtufiles directory

112
editors/openoffice/files/patch-external+neon+md5.c.pat Normal file
View File

@ -0,0 +1,112 @@
--- /dev/null Thu Aug 8 22:39:51 2002
+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002
@@ -0,0 +1,109 @@
+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001
+--- sub\md5.c Tue May 08 12:52:02 2001
+***************
+*** 278,290 ****
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const md5_uint32 *words = buffer;
+! size_t nwords = len / sizeof (md5_uint32);
+! const md5_uint32 *endp = words + nwords;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+--- 278,289 ----
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const unsigned char *words = buffer;
+! const unsigned char *endp = words + len;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+***************
+*** 313,324 ****
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+! ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+--- 312,325 ----
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \
+! | (words[2] << 16) | (words[3] << 24); \
+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \
+! words += 4; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+***************
+*** 431,441 ****
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+--- 432,442 ----
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+***************
+*** 443,453 ****
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);
+--- 444,454 ----
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);

17
editors/openoffice/files/patch-external+neon+neonpatch.sh
View File

@ -1,11 +1,14 @@
--- ../external/neon/neonpatch.sh.orig Mon Apr 15 15:22:48 2002
+++ ../external/neon/neonpatch.sh Mon Apr 15 15:22:54 2002
@@ -121,7 +121,7 @@
--- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001
+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002
@@ -119,10 +119,7 @@
# apply the patches
#
for PNAME in `cat flist.pat`
do
- for PNAME in `cat flist.pat`
- do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
+ patch < pat/$PNAME.pat rtufiles/$PNAME
done
- done
+ patch < md5.c.pat rtufiles/md5.c
#
# copy the SD files into rtufiles directory

112
editors/openoffice/files/patch-external::neon::md5.c.pat Normal file
View File

@ -0,0 +1,112 @@
--- /dev/null Thu Aug 8 22:39:51 2002
+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002
@@ -0,0 +1,109 @@
+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001
+--- sub\md5.c Tue May 08 12:52:02 2001
+***************
+*** 278,290 ****
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const md5_uint32 *words = buffer;
+! size_t nwords = len / sizeof (md5_uint32);
+! const md5_uint32 *endp = words + nwords;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+--- 278,289 ----
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const unsigned char *words = buffer;
+! const unsigned char *endp = words + len;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+***************
+*** 313,324 ****
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+! ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+--- 312,325 ----
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \
+! | (words[2] << 16) | (words[3] << 24); \
+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \
+! words += 4; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+***************
+*** 431,441 ****
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+--- 432,442 ----
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+***************
+*** 443,453 ****
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);
+--- 444,454 ----
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);

17
editors/openoffice/files/patch-external::neon::neonpatch.sh
View File

@ -1,11 +1,14 @@
--- ../external/neon/neonpatch.sh.orig Mon Apr 15 15:22:48 2002
+++ ../external/neon/neonpatch.sh Mon Apr 15 15:22:54 2002
@@ -121,7 +121,7 @@
--- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001
+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002
@@ -119,10 +119,7 @@
# apply the patches
#
for PNAME in `cat flist.pat`
do
- for PNAME in `cat flist.pat`
- do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
+ patch < pat/$PNAME.pat rtufiles/$PNAME
done
- done
+ patch < md5.c.pat rtufiles/md5.c
#
# copy the SD files into rtufiles directory