[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Sat May 23 23:23:09 UTC 2020


The branch, master has been updated
       via  799de21a Fixed the use of openssl MD4 for transfer checksums.
      from  1cb1edeb Optional openssl support for MD4 pre-transfer checksums (but, sadly, not transfer checksums).

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 799de21af61ad7b3018749e8a3f0f0319af54521
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sat May 23 16:22:36 2020 -0700

    Fixed the use of openssl MD4 for transfer checksums.

-----------------------------------------------------------------------

Summary of changes:
 checksum.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/checksum.c b/checksum.c
index 596a31ad..3a6959b2 100644
--- a/checksum.c
+++ b/checksum.c
@@ -316,7 +316,7 @@ uint32 get_checksum1(char *buf1, int32 len)
 void get_checksum2(char *buf, int32 len, char *sum)
 {
 	md_context m;
-#if 0 /* #ifdef USE_OPENSSL */
+#ifdef USE_OPENSSL
 	MD4_CTX m4;
 #endif
 	MD5_CTX m5;
@@ -342,15 +342,15 @@ void get_checksum2(char *buf, int32 len, char *sum)
 		break;
 	  }
 	  case CSUM_MD4:
-#if 0 /* #ifdef USE_OPENSSL -- this doesn't match the old checksums. */
+#ifdef USE_OPENSSL
 	  {
 		MD4_Init(&m4);
+		MD4_Update(&m4, (uchar *)buf, len);
 		if (checksum_seed) {
 			uchar seedbuf[4];
 			SIVALu(seedbuf, 0, checksum_seed);
 			MD4_Update(&m4, seedbuf, 4);
 		}
-		MD4_Update(&m4, (uchar *)buf, len);
 		MD4_Final((uchar *)sum, &m4);
 		break;
 	  }


-- 
The rsync repository.



More information about the rsync-cvs mailing list