BackupPCd
Check-in [e063cc9d59]
Login
HomeTimelineBranchesTagsTicketsWiki

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Updated "file_sync" to use MD5 instead of MD4 for hashing
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: e063cc9d59237959647a9a04541b9463c690f40e
User & Date: rkeene 2008-11-12 17:43:50
Context
2008-11-15
13:04
Updated ignores, and updated header includes to support win32 check-in: 22df989e88 user: rkeene tags: trunk
2008-11-12
17:43
Updated "file_sync" to use MD5 instead of MD4 for hashing check-in: e063cc9d59 user: rkeene tags: trunk
2008-11-09
19:44
Updated file_sync-standalone to use an internal htonll (renamed to avoid conflicts where real htonll implementations exist) check-in: fc476508a4 user: rkeene tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in.

︙︙
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48


backuppcd-tar$(EXEEXT): Makefile.dep backuppcd-tar.o net.o backuppcd-common.o sha1.o @LIBOBJS@
	$(CC) $(CPPFLAGS) $(CFLAGS) -o backuppcd-tar$(EXEEXT) backuppcd-tar.o net.o backuppcd-common.o sha1.o @LIBOBJS@ $(LDFLAGS)

backuppcd-passwd$(EXEEXT): Makefile.dep backuppcd-passwd.o sha1.o
	$(CC) $(CPPFLAGS) $(CFLAGS) -o backuppcd-passwd$(EXEEXT) backuppcd-passwd.o sha1.o $(LDFLAGS)

tools/file_sync$(EXEEXT): Makefile.dep tools/file_sync.o net.o md4.o @LIBOBJS@
	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -o tools/file_sync$(EXEEXT) tools/file_sync.o net.o md4.o @LIBOBJS@ -L.. $(LDFLAGS)

libbackuppcd$(AREXT): Makefile.dep libbackuppcd.o net.o backuppcd-common.o sha1.o md4.o md5.o @LIBOBJS@
	$(AR) rcu libbackuppcd$(AREXT) libbackuppcd.o net.o backuppcd-common.o sha1.o md4.o md5.o @LIBOBJS@
	$(RANLIB) libbackuppcd$(AREXT)

libbackuppc$(AREXT): Makefile.dep libbackuppc.o sha1.o md4.o md5.o
	$(AR) rcu libbackuppc$(AREXT) libbackuppc.o sha1.o md4.o md5.o








|
|








33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48


backuppcd-tar$(EXEEXT): Makefile.dep backuppcd-tar.o net.o backuppcd-common.o sha1.o @LIBOBJS@
	$(CC) $(CPPFLAGS) $(CFLAGS) -o backuppcd-tar$(EXEEXT) backuppcd-tar.o net.o backuppcd-common.o sha1.o @LIBOBJS@ $(LDFLAGS)

backuppcd-passwd$(EXEEXT): Makefile.dep backuppcd-passwd.o sha1.o
	$(CC) $(CPPFLAGS) $(CFLAGS) -o backuppcd-passwd$(EXEEXT) backuppcd-passwd.o sha1.o $(LDFLAGS)

tools/file_sync$(EXEEXT): Makefile.dep tools/file_sync.o net.o md5.o @LIBOBJS@
	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -o tools/file_sync$(EXEEXT) tools/file_sync.o net.o md5.o @LIBOBJS@ -L.. $(LDFLAGS)

libbackuppcd$(AREXT): Makefile.dep libbackuppcd.o net.o backuppcd-common.o sha1.o md4.o md5.o @LIBOBJS@
	$(AR) rcu libbackuppcd$(AREXT) libbackuppcd.o net.o backuppcd-common.o sha1.o md4.o md5.o @LIBOBJS@
	$(RANLIB) libbackuppcd$(AREXT)

libbackuppc$(AREXT): Makefile.dep libbackuppc.o sha1.o md4.o md5.o
	$(AR) rcu libbackuppc$(AREXT) libbackuppc.o sha1.o md4.o md5.o
︙︙

Changes to tools/file_sync-standalone.c.

︙︙
18
19
20
21
22
23
24


























25
26
27
28
29
30
31

#define SPOTVAR_D(x) PRINTERR_D(#x " = %lf", x)
#define SPOTVAR_X(x) PRINTERR_D(#x " = 0x%x", (unsigned int) x)
#define SPOTVAR_I(x) PRINTERR_D(#x " = %i", (int) x)
#define SPOTVAR_P(x) PRINTERR_D(#x " = %p", x)
#define SPOTVAR_S(x) PRINTERR_D(#x " = \"%s\"", x)
#define PRINTERR(x...) { PRINT_LINE; fprintf(stderr, x); fprintf(stderr, "\n"); fflush(stderr); }
#define LOG(x...) { PRINT_LINE; fprintf(stderr, "LOG: " x); fprintf(stderr, "\n"); }



























#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/stat.h>
#include <signal.h>
#include <limits.h>
#include <stdint.h>








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57

#define SPOTVAR_D(x) PRINTERR_D(#x " = %lf", x)
#define SPOTVAR_X(x) PRINTERR_D(#x " = 0x%x", (unsigned int) x)
#define SPOTVAR_I(x) PRINTERR_D(#x " = %i", (int) x)
#define SPOTVAR_P(x) PRINTERR_D(#x " = %p", x)
#define SPOTVAR_S(x) PRINTERR_D(#x " = \"%s\"", x)
#define PRINTERR(x...) { PRINT_LINE; fprintf(stderr, x); fprintf(stderr, "\n"); fflush(stderr); }
#define LOG(x...) { PRINT_LINE; fprintf(stderr, "LOG: " x); fprintf(stderr, "\n"); }

/* MD5.H BEGINS */
/*
 * This is an OpenSSL-compatible implementation of the RSA Data Security,
 * Inc. MD5 Message-Digest Algorithm (RFC 1321).
 *
 * Written by Solar Designer <solar at openwall.com> in 2001, and placed
 * in the public domain.  There's absolutely no warranty.
 *
 * See md5.c for more information.
 */

/* Any 32-bit or wider unsigned integer data type will do */
typedef unsigned int MD5_u32plus;

typedef struct {
	MD5_u32plus lo, hi;
	MD5_u32plus a, b, c, d;
	unsigned char buffer[64];
	MD5_u32plus block[16];
} MD5_CTX;

static void MD5_Init(MD5_CTX *ctx);
static void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);
static void MD5_Final(unsigned char *result, MD5_CTX *ctx);
/* MD5.H ENDS */

#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/stat.h>
#include <signal.h>
#include <limits.h>
#include <stdint.h>
︙︙
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94

#define INT_MAX (0x7fffffff)
#endif

#ifndef O_LARGEFILE
#define O_LARGEFILE 0
#endif

/* MD4.H FOLLOWS */
/* MD4.H - header file for MD4C.C
 */

/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
   rights reserved.

   License to copy and use this software is granted provided that it
   is identified as the "RSA Data Security, Inc. MD4 Message-Digest
   Algorithm" in all material mentioning or referencing this software
   or this function.

   License is also granted to make and use derivative works provided
   that such works are identified as "derived from the RSA Data
   Security, Inc. MD4 Message-Digest Algorithm" in all material
   mentioning or referencing the derived work.

   RSA Data Security, Inc. makes no representations concerning either
   the merchantability of this software or the suitability of this
   software for any particular purpose. It is provided "as is"
   without express or implied warranty of any kind.

   These notices must be retained in any copies of any part of this
   documentation and/or software.
 */

/* MD4 context. */
typedef struct {
  uint32_t state[4];    /* state (ABCD) */
  uint32_t count[2];    /* number of bits, modulo 2^64 (lsb first) */
  unsigned char buffer[64];                         /* input buffer */
} rsaref_MD4_CTX;

static void rsaref_MD4Init(rsaref_MD4_CTX *);
static void rsaref_MD4Update(rsaref_MD4_CTX *, unsigned char *, unsigned int);
static void rsaref_MD4Final(unsigned char [16], rsaref_MD4_CTX *);
/* MD4.H ENDS */

uint64_t net_bytesout = 0;
uint64_t net_bytesin = 0;

static uint64_t internal_htonll(uint64_t n) {
	static int swapped_byte_order = -1;
	uint64_t retval;









<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<








69
70
71
72
73
74
75






































76
77
78
79
80
81
82

#define INT_MAX (0x7fffffff)
#endif

#ifndef O_LARGEFILE
#define O_LARGEFILE 0
#endif







































uint64_t net_bytesout = 0;
uint64_t net_bytesin = 0;

static uint64_t internal_htonll(uint64_t n) {
	static int swapped_byte_order = -1;
	uint64_t retval;
︙︙
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293


	DPRINTF("write_large_net(fd=%i, buf=%p, count=%lu) = %li", fd, buf, (unsigned long) count, (long) retval);

	return(retval);
}

static int sync_transmit(const char *host, int port, const char *file, uint64_t blocksize) {
	rsaref_MD4_CTX mdctx;
	unsigned char md4buf[16];
	unsigned char *buf;
	uint64_t filesize;
	uint32_t blockok_size, blockidx;
	uint8_t *blockok, blockok_val;
	ssize_t read_ret, write_ret;
	off_t lseek_ret;
	off_t curpos, destpos;








|
|








266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281


	DPRINTF("write_large_net(fd=%i, buf=%p, count=%lu) = %li", fd, buf, (unsigned long) count, (long) retval);

	return(retval);
}

static int sync_transmit(const char *host, int port, const char *file, uint64_t blocksize) {
	MD5_CTX mdctx;
	unsigned char md5buf[16];
	unsigned char *buf;
	uint64_t filesize;
	uint32_t blockok_size, blockidx;
	uint8_t *blockok, blockok_val;
	ssize_t read_ret, write_ret;
	off_t lseek_ret;
	off_t curpos, destpos;
︙︙
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390

		}

		if (read_ret == 0) {
			CHECKPOINT;
			break;
		}

		rsaref_MD4Init(&mdctx);
		rsaref_MD4Update(&mdctx, buf, read_ret);
		rsaref_MD4Final(md4buf, &mdctx);

		write_ret = write_large_net(sockfd, md4buf, sizeof(md4buf));
		if (write_ret != sizeof(md4buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}
	}

	if (retval != -1) {








|
|
|

|
|








359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378

		}

		if (read_ret == 0) {
			CHECKPOINT;
			break;
		}

		MD5_Init(&mdctx);
		MD5_Update(&mdctx, buf, read_ret);
		MD5_Final(md5buf, &mdctx);

		write_ret = write_large_net(sockfd, md5buf, sizeof(md5buf));
		if (write_ret != sizeof(md5buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}
	}

	if (retval != -1) {
︙︙
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472

	close(fd);
	close(sockfd);

	return(retval);
}

static int sync_receive(int port, const char *file) {
	rsaref_MD4_CTX mdctx;
	unsigned char md4buf[16], check_md4buf[16];
	unsigned char *buf;
	uint64_t filesize, filesize_s;
	uint64_t blocksize;
	uint32_t blockok_size, blockidx = 0;
	uint8_t *blockok, blockok_val;
	ssize_t cur_read_ret, read_ret, write_ret;
	size_t bytestowrite;








|
|








445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460

	close(fd);
	close(sockfd);

	return(retval);
}

static int sync_receive(int port, const char *file) {
	MD5_CTX mdctx;
	unsigned char md5buf[16], check_md5buf[16];
	unsigned char *buf;
	uint64_t filesize, filesize_s;
	uint64_t blocksize;
	uint32_t blockok_size, blockidx = 0;
	uint8_t *blockok, blockok_val;
	ssize_t cur_read_ret, read_ret, write_ret;
	size_t bytestowrite;
︙︙
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585

			memset(buf, '\0', bytestowrite);
			read_ret = bytestowrite;
			skipbytes = bytestowrite;
		} else {
			skipbytes = 0;
		}

		rsaref_MD4Init(&mdctx);
		rsaref_MD4Update(&mdctx, buf, read_ret);
		rsaref_MD4Final(md4buf, &mdctx);

		read_ret = read_large_net(sockfd, check_md4buf, sizeof(check_md4buf));
		if (read_ret != sizeof(check_md4buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}

		if (memcmp(check_md4buf, md4buf, sizeof(md4buf)) == 0) {
			blockok_val = 1;
		} else {
			blockok_val = 0;
		}

		if (i == 0 || i == 8) {
			if (i == 8) {








|
|
|

|
|





|








548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573

			memset(buf, '\0', bytestowrite);
			read_ret = bytestowrite;
			skipbytes = bytestowrite;
		} else {
			skipbytes = 0;
		}

		MD5_Init(&mdctx);
		MD5_Update(&mdctx, buf, read_ret);
		MD5_Final(md5buf, &mdctx);

		read_ret = read_large_net(sockfd, check_md5buf, sizeof(check_md5buf));
		if (read_ret != sizeof(check_md5buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}

		if (memcmp(check_md5buf, md5buf, sizeof(md5buf)) == 0) {
			blockok_val = 1;
		} else {
			blockok_val = 0;
		}

		if (i == 0 || i == 8) {
			if (i == 8) {
︙︙
728
729
730
731
732
733
734
735
736
737


738
739


740
741
742
743
744


745


746

747
748
749
750

751
752
753
754
755
756


757
758






759
760
761
762

763

764








765
766

767
768
769
770

771



772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791

792
793
794
795
796
797
798
799

800
801
802
803
804
805
806
807


808




809
810
811
812
813
814
815
816




817
818

819
820
821
822
823
824

825
826
827
828
829
830
831
832
833




834
835
836
837
838
839
840
841
842
843
844


845
846
847
848
849
850
851
852
853
854
855
856
857

858
859
860
861
862
863
864
865
866
867
868
869

870
871
872
873
874


875
876
877
878
879
880
881

882
883





884
885

886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902



903
904

905
906
907
908
909

910
911
912
913
914
915
916

917
918
919
920
921
922
923

924
925


926
927
928
929
930
931
932
933
934



935
936
937
938
939
940
941
942

943
944

945
946
947

948
949
950
951

952
953
954
955
956
957
958
959
960
961

962
963
964
965
966
967
968

969
970
971
972

973
974
975
976
977
978
979
980
981
982
983
984
985

986
987





988

989
990
991
992
993
994
995


996
997
998
999
1000
1001
1002
1003


	printf("Bytes In: %llu, Bytes Out: %llu\n", (unsigned long long) net_bytesin, (unsigned long long) net_bytesout);

	return(retval);
}


/* MD4.C FOLLOWS */
/* MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm
 */



/* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.



   License to copy and use this software is granted provided that it
   is identified as the "RSA Data Security, Inc. MD4 Message-Digest
   Algorithm" in all material mentioning or referencing this software
   or this function.





   License is also granted to make and use derivative works provided

   that such works are identified as "derived from the RSA Data
   Security, Inc. MD4 Message-Digest Algorithm" in all material
   mentioning or referencing the derived work.


   RSA Data Security, Inc. makes no representations concerning either
   the merchantability of this software or the suitability of this
   software for any particular purpose. It is provided "as is"
   without express or implied warranty of any kind.

   These notices must be retained in any copies of any part of this


   documentation and/or software.
 */







/* Constants for MD4Transform routine.
 */
#define S11 3

#define S12 7

#define S13 11








#define S14 19
#define S21 3

#define S22 5
#define S23 9
#define S24 13
#define S31 3

#define S32 9



#define S33 11
#define S34 15

static void MD4Transform(uint32_t [4], unsigned char [64]);
static void Encode(unsigned char *, uint32_t *, unsigned int);
static void Decode(uint32_t *, unsigned char *, unsigned int);

static unsigned char PADDING[64] = {
  0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};

/* F, G and H are basic MD4 functions.
 */
#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
#define H(x, y, z) ((x) ^ (y) ^ (z))

/* ROTATE_LEFT rotates x left n bits.

 */
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))

/* FF, GG and HH are transformations for rounds 1, 2 and 3 */
/* Rotation is separate from addition to prevent recomputation */
#define FF(a, b, c, d, x, s) { \
    (a) += F ((b), (c), (d)) + (x); \
    (a) = ROTATE_LEFT ((a), (s)); \

  }
#define GG(a, b, c, d, x, s) { \
    (a) += G ((b), (c), (d)) + (x) + (uint32_t)0x5a827999; \
    (a) = ROTATE_LEFT ((a), (s)); \
  }
#define HH(a, b, c, d, x, s) { \
    (a) += H ((b), (c), (d)) + (x) + (uint32_t)0x6ed9eba1; \
    (a) = ROTATE_LEFT ((a), (s)); \


  }





/* MD4 initialization. Begins an MD4 operation, writing a new context.
 */
static void rsaref_MD4Init (context)
rsaref_MD4_CTX *context;                                        /* context */
{
  context->count[0] = context->count[1] = 0;





  /* Load magic initialization constants.
   */

  context->state[0] = 0x67452301;
  context->state[1] = 0xefcdab89;
  context->state[2] = 0x98badcfe;
  context->state[3] = 0x10325476;
}


/* MD4 block update operation. Continues an MD4 message-digest
     operation, processing another message block, and updating the
     context.
 */
static void rsaref_MD4Update (context, input, inputLen)
rsaref_MD4_CTX *context;                                        /* context */
unsigned char *input;                                /* input block */
unsigned int inputLen;                     /* length of input block */
{




  unsigned int i, index, partLen;

  /* Compute number of bytes mod 64 */
  index = (unsigned int)((context->count[0] >> 3) & 0x3F);
  /* Update number of bits */
  if ((context->count[0] += ((uint32_t)inputLen << 3))
      < ((uint32_t)inputLen << 3))
    context->count[1]++;
  context->count[1] += ((uint32_t)inputLen >> 29);

  partLen = 64 - index;



  /* Transform as many times as possible.
   */
  if (inputLen >= partLen) {
    memcpy
      ((unsigned char *)&context->buffer[index], (unsigned char *)input, partLen);
    MD4Transform (context->state, context->buffer);

    for (i = partLen; i + 63 < inputLen; i += 64)
      MD4Transform (context->state, &input[i]);

    index = 0;
  }

  else
    i = 0;

  /* Buffer remaining input */
  memcpy
    ((unsigned char *)&context->buffer[index], (unsigned char *)&input[i],
     inputLen-i);
}

/* MD4 finalization. Ends an MD4 message-digest operation, writing the
     the message digest and zeroizing the context.
 */

static void rsaref_MD4Final (digest, context)
unsigned char digest[16];                         /* message digest */
rsaref_MD4_CTX *context;                                        /* context */
{
  unsigned char bits[8];


  unsigned int index, padLen;

  /* Save number of bits */
  Encode (bits, context->count, 8);

  /* Pad out to 56 mod 64.
   */

  index = (unsigned int)((context->count[0] >> 3) & 0x3f);
  padLen = (index < 56) ? (56 - index) : (120 - index);





  rsaref_MD4Update (context, PADDING, padLen);


  /* Append length (before padding) */
  rsaref_MD4Update (context, bits, 8);
  /* Store state in digest */
  Encode (digest, context->state, 16);

  /* Zeroize sensitive information.
   */
  memset ((unsigned char *)context, 0, sizeof (*context));
}

/* MD4 basic transformation. Transforms state based on block.
 */
static void MD4Transform (state, block)
uint32_t state[4];
unsigned char block[64];
{
  uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];




  Decode (x, block, 64);


  /* Round 1 */
  FF (a, b, c, d, x[ 0], S11); /* 1 */
  FF (d, a, b, c, x[ 1], S12); /* 2 */
  FF (c, d, a, b, x[ 2], S13); /* 3 */

  FF (b, c, d, a, x[ 3], S14); /* 4 */
  FF (a, b, c, d, x[ 4], S11); /* 5 */
  FF (d, a, b, c, x[ 5], S12); /* 6 */
  FF (c, d, a, b, x[ 6], S13); /* 7 */
  FF (b, c, d, a, x[ 7], S14); /* 8 */
  FF (a, b, c, d, x[ 8], S11); /* 9 */
  FF (d, a, b, c, x[ 9], S12); /* 10 */

  FF (c, d, a, b, x[10], S13); /* 11 */
  FF (b, c, d, a, x[11], S14); /* 12 */
  FF (a, b, c, d, x[12], S11); /* 13 */
  FF (d, a, b, c, x[13], S12); /* 14 */
  FF (c, d, a, b, x[14], S13); /* 15 */
  FF (b, c, d, a, x[15], S14); /* 16 */


  /* Round 2 */
  GG (a, b, c, d, x[ 0], S21); /* 17 */


  GG (d, a, b, c, x[ 4], S22); /* 18 */
  GG (c, d, a, b, x[ 8], S23); /* 19 */
  GG (b, c, d, a, x[12], S24); /* 20 */
  GG (a, b, c, d, x[ 1], S21); /* 21 */
  GG (d, a, b, c, x[ 5], S22); /* 22 */
  GG (c, d, a, b, x[ 9], S23); /* 23 */
  GG (b, c, d, a, x[13], S24); /* 24 */
  GG (a, b, c, d, x[ 2], S21); /* 25 */
  GG (d, a, b, c, x[ 6], S22); /* 26 */



  GG (c, d, a, b, x[10], S23); /* 27 */
  GG (b, c, d, a, x[14], S24); /* 28 */
  GG (a, b, c, d, x[ 3], S21); /* 29 */
  GG (d, a, b, c, x[ 7], S22); /* 30 */
  GG (c, d, a, b, x[11], S23); /* 31 */
  GG (b, c, d, a, x[15], S24); /* 32 */

  /* Round 3 */

  HH (a, b, c, d, x[ 0], S31); /* 33 */
  HH (d, a, b, c, x[ 8], S32); /* 34 */

  HH (c, d, a, b, x[ 4], S33); /* 35 */
  HH (b, c, d, a, x[12], S34); /* 36 */
  HH (a, b, c, d, x[ 2], S31); /* 37 */

  HH (d, a, b, c, x[10], S32); /* 38 */
  HH (c, d, a, b, x[ 6], S33); /* 39 */
  HH (b, c, d, a, x[14], S34); /* 40 */
  HH (a, b, c, d, x[ 1], S31); /* 41 */

  HH (d, a, b, c, x[ 9], S32); /* 42 */
  HH (c, d, a, b, x[ 5], S33); /* 43 */
  HH (b, c, d, a, x[13], S34); /* 44 */
  HH (a, b, c, d, x[ 3], S31); /* 45 */
  HH (d, a, b, c, x[11], S32); /* 46 */
  HH (c, d, a, b, x[ 7], S33); /* 47 */
  HH (b, c, d, a, x[15], S34); /* 48 */

  state[0] += a;
  state[1] += b;

  state[2] += c;
  state[3] += d;

  /* Zeroize sensitive information.
   */
  memset ((unsigned char *)x, 0, sizeof (x));
}


/* Encodes input (uint32_t) into output (unsigned char). Assumes len is
     a multiple of 4.
 */

static void Encode (output, input, len)
unsigned char *output;
uint32_t *input;
unsigned int len;
{
  unsigned int i, j;

  for (i = 0, j = 0; j < len; i++, j += 4) {
    output[j] = (unsigned char)(input[i] & 0xff);
    output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
    output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
    output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
  }

}






/* Decodes input (unsigned char) into output (uint32_t). Assumes len is

     a multiple of 4.
 */
static void Decode (output, input, len)

uint32_t *output;
unsigned char *input;
unsigned int len;


{
  unsigned int i, j;

  for (i = 0, j = 0; j < len; i++, j += 4)
    output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) |
      (((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24);
}
/* MD4.C ENDS */








|
<
|
>
>
|
<
>
>
|
<
<
|
|
>
>
|
>
>
|
>
|
<
|

>
|
<
<
<
|
<
>
>
|

>
>
>
>
>
>
|
<

|
>
|
>
|
>
>
>
>
>
>
>
>
|
|
>
|
|
|
|
>
|
>
>
>
|
<
|
<
<
<
|
<
<
<
<
<

<
|
<
<
<
|
<
>

|
|
|
<
|
<
<
>
|
<
<
|
|
|
<
|
>
>
|
>
>
>
>
|
<
<
<
<
|
|
|
>
>
>
>
|
<
>
|
|
|
|
<
|
>
|
|
|
<
<
<
<
<
|
>
>
>
>
|
|
|
|
|
|
|
|
|
|
|
>
>

<
|
<
|
|
|
|
|
|
|
|
<
>
|
<
|
<
<
<
<
<
|
|
|
<
>
|
<
<
|
|
>
>
|
|
|
|
|
|
<
>
|
|
>
>
>
>
>
<

>
|
<
|
<
|
<
<
<
|
|
<
<
|
<
<
|
|
>
>
>

<
>
|
|
<
|
<
>
|
|
|
|
|
|
|
>
|
<
|
<
<
<
|
>
|
|
>
>
|
|
|
|
|
|
|
|
|
>
>
>
|
|
|
|
|
<
|
|
>
|
|
>
|
<
|
>
|
<
|
<
>
|
|
|
|
|
|
|

|
|
>
|
|
|
<
<
<
|
>

|
|
<
>
|
<
<
<
<
<
|
<
|
|
|
|
|
>
|
|
>
>
>
>
>
|
>
|
<
|
|
|
|
|
>
>
|
<
|
<
<
<

|

716
717
718
719
720
721
722
723

724
725
726
727

728
729
730


731
732
733
734
735
736
737
738
739
740

741
742
743
744



745

746
747
748
749
750
751
752
753
754
755
756

757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783

784



785





786

787



788

789
790
791
792
793

794


795
796


797
798
799

800
801
802
803
804
805
806
807
808




809
810
811
812
813
814
815
816

817
818
819
820
821

822
823
824
825
826





827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845

846

847
848
849
850
851
852
853
854

855
856

857





858
859
860

861
862


863
864
865
866
867
868
869
870
871
872

873
874
875
876
877
878
879
880

881
882
883

884

885



886
887


888


889
890
891
892
893
894

895
896
897

898

899
900
901
902
903
904
905
906
907
908

909



910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932

933
934
935
936
937
938
939

940
941
942

943

944
945
946
947
948
949
950
951
952
953
954
955
956
957
958



959
960
961
962
963

964
965





966

967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982

983
984
985
986
987
988
989
990

991



992
993


	printf("Bytes In: %llu, Bytes Out: %llu\n", (unsigned long long) net_bytesin, (unsigned long long) net_bytesout);

	return(retval);
}


/* MD5.C BEGINS */

/*
 * This is an OpenSSL-compatible implementation of the RSA Data Security,
 * Inc. MD5 Message-Digest Algorithm (RFC 1321).
 *

 * Written by Solar Designer <solar at openwall.com> in 2001, and placed
 * in the public domain.  There's absolutely no warranty.
 *


 * This differs from Colin Plumb's older public domain implementation in
 * that no 32-bit integer data type is required, there's no compile-time
 * endianness configuration, and the function prototypes match OpenSSL's.
 * The primary goals are portability and ease of use.
 *
 * This implementation is meant to be fast, but not as fast as possible.
 * Some known optimizations are not included to reduce source code size
 * and avoid compile-time configuration.
 */


#include <string.h>

/*
 * The basic MD5 functions.



 *

 * F and G are optimized compared to their RFC 1321 definitions for
 * architectures that lack an AND-NOT instruction, just like in Colin Plumb's
 * implementation.
 */
#define F(x, y, z)			((z) ^ ((x) & ((y) ^ (z))))
#define G(x, y, z)			((y) ^ ((z) & ((x) ^ (y))))
#define H(x, y, z)			((x) ^ (y) ^ (z))
#define I(x, y, z)			((y) ^ ((x) | ~(z)))

/*
 * The MD5 transformation for all four rounds.

 */
#define STEP(f, a, b, c, d, x, t, s) \
	(a) += f((b), (c), (d)) + (x) + (t); \
	(a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \
	(a) += (b);

/*
 * SET reads 4 input bytes in little-endian byte order and stores them
 * in a properly aligned word in host byte order.
 *
 * The check for little-endian architectures that tolerate unaligned
 * memory accesses is just an optimization.  Nothing will break if it
 * doesn't work.
 */
#if defined(__i386__) || defined(__x86_64__) || defined(__vax__)
#define SET(n) \
	(*(MD5_u32plus *)&ptr[(n) * 4])
#define GET(n) \
	SET(n)
#else
#define SET(n) \
	(ctx->block[(n)] = \
	(MD5_u32plus)ptr[(n) * 4] | \
	((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \
	((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \
	((MD5_u32plus)ptr[(n) * 4 + 3] << 24))
#define GET(n) \

	(ctx->block[(n)])



#endif







/*



 * This processes one or more 64-byte data blocks, but does NOT update

 * the bit counters.  There are no alignment requirements.
 */
static void *body(MD5_CTX *ctx, void *data, unsigned long size)
{
	unsigned char *ptr;

	MD5_u32plus a, b, c, d;


	MD5_u32plus saved_a, saved_b, saved_c, saved_d;



	ptr = data;

	a = ctx->a;

	b = ctx->b;
	c = ctx->c;
	d = ctx->d;

	do {
		saved_a = a;
		saved_b = b;
		saved_c = c;
		saved_d = d;





/* Round 1 */
		STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7)
		STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12)
		STEP(F, c, d, a, b, SET(2), 0x242070db, 17)
		STEP(F, b, c, d, a, SET(3), 0xc1bdceee, 22)
		STEP(F, a, b, c, d, SET(4), 0xf57c0faf, 7)
		STEP(F, d, a, b, c, SET(5), 0x4787c62a, 12)

		STEP(F, c, d, a, b, SET(6), 0xa8304613, 17)
		STEP(F, b, c, d, a, SET(7), 0xfd469501, 22)
		STEP(F, a, b, c, d, SET(8), 0x698098d8, 7)
		STEP(F, d, a, b, c, SET(9), 0x8b44f7af, 12)
		STEP(F, c, d, a, b, SET(10), 0xffff5bb1, 17)

		STEP(F, b, c, d, a, SET(11), 0x895cd7be, 22)
		STEP(F, a, b, c, d, SET(12), 0x6b901122, 7)
		STEP(F, d, a, b, c, SET(13), 0xfd987193, 12)
		STEP(F, c, d, a, b, SET(14), 0xa679438e, 17)
		STEP(F, b, c, d, a, SET(15), 0x49b40821, 22)






/* Round 2 */
		STEP(G, a, b, c, d, GET(1), 0xf61e2562, 5)
		STEP(G, d, a, b, c, GET(6), 0xc040b340, 9)
		STEP(G, c, d, a, b, GET(11), 0x265e5a51, 14)
		STEP(G, b, c, d, a, GET(0), 0xe9b6c7aa, 20)
		STEP(G, a, b, c, d, GET(5), 0xd62f105d, 5)
		STEP(G, d, a, b, c, GET(10), 0x02441453, 9)
		STEP(G, c, d, a, b, GET(15), 0xd8a1e681, 14)
		STEP(G, b, c, d, a, GET(4), 0xe7d3fbc8, 20)
		STEP(G, a, b, c, d, GET(9), 0x21e1cde6, 5)
		STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9)
		STEP(G, c, d, a, b, GET(3), 0xf4d50d87, 14)
		STEP(G, b, c, d, a, GET(8), 0x455a14ed, 20)
		STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5)
		STEP(G, d, a, b, c, GET(2), 0xfcefa3f8, 9)
		STEP(G, c, d, a, b, GET(7), 0x676f02d9, 14)
		STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20)


/* Round 3 */

		STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4)
		STEP(H, d, a, b, c, GET(8), 0x8771f681, 11)
		STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16)
		STEP(H, b, c, d, a, GET(14), 0xfde5380c, 23)
		STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4)
		STEP(H, d, a, b, c, GET(4), 0x4bdecfa9, 11)
		STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16)
		STEP(H, b, c, d, a, GET(10), 0xbebfbc70, 23)

		STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4)
		STEP(H, d, a, b, c, GET(0), 0xeaa127fa, 11)

		STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16)





		STEP(H, b, c, d, a, GET(6), 0x04881d05, 23)
		STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4)
		STEP(H, d, a, b, c, GET(12), 0xe6db99e5, 11)

		STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16)
		STEP(H, b, c, d, a, GET(2), 0xc4ac5665, 23)



/* Round 4 */
		STEP(I, a, b, c, d, GET(0), 0xf4292244, 6)
		STEP(I, d, a, b, c, GET(7), 0x432aff97, 10)
		STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15)
		STEP(I, b, c, d, a, GET(5), 0xfc93a039, 21)
		STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6)
		STEP(I, d, a, b, c, GET(3), 0x8f0ccc92, 10)
		STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15)
		STEP(I, b, c, d, a, GET(1), 0x85845dd1, 21)

		STEP(I, a, b, c, d, GET(8), 0x6fa87e4f, 6)
		STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0, 10)
		STEP(I, c, d, a, b, GET(6), 0xa3014314, 15)
		STEP(I, b, c, d, a, GET(13), 0x4e0811a1, 21)
		STEP(I, a, b, c, d, GET(4), 0xf7537e82, 6)
		STEP(I, d, a, b, c, GET(11), 0xbd3af235, 10)
		STEP(I, c, d, a, b, GET(2), 0x2ad7d2bb, 15)
		STEP(I, b, c, d, a, GET(9), 0xeb86d391, 21)


		a += saved_a;
		b += saved_b;

		c += saved_c;

		d += saved_d;




		ptr += 64;


	} while (size -= 64);



	ctx->a = a;
	ctx->b = b;
	ctx->c = c;
	ctx->d = d;


	return ptr;
}


void MD5_Init(MD5_CTX *ctx)

{
	ctx->a = 0x67452301;
	ctx->b = 0xefcdab89;
	ctx->c = 0x98badcfe;
	ctx->d = 0x10325476;

	ctx->lo = 0;
	ctx->hi = 0;
}


void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)



{
	MD5_u32plus saved_lo;
	unsigned long used, free;

	saved_lo = ctx->lo;
	if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
		ctx->hi++;
	ctx->hi += size >> 29;

	used = saved_lo & 0x3f;

	if (used) {
		free = 64 - used;

		if (size < free) {
			memcpy(&ctx->buffer[used], data, size);
			return;
		}

		memcpy(&ctx->buffer[used], data, free);
		data = (unsigned char *)data + free;
		size -= free;
		body(ctx, ctx->buffer, 64);

	}

	if (size >= 64) {
		data = body(ctx, data, size & ~(unsigned long)0x3f);
		size &= 0x3f;
	}


	memcpy(ctx->buffer, data, size);
}


void MD5_Final(unsigned char *result, MD5_CTX *ctx)

{
	unsigned long used, free;

	used = ctx->lo & 0x3f;

	ctx->buffer[used++] = 0x80;

	free = 64 - used;

	if (free < 8) {
		memset(&ctx->buffer[used], 0, free);
		body(ctx, ctx->buffer, 64);
		used = 0;
		free = 64;
	}




	memset(&ctx->buffer[used], 0, free - 8);

	ctx->lo <<= 3;
	ctx->buffer[56] = ctx->lo;

	ctx->buffer[57] = ctx->lo >> 8;
	ctx->buffer[58] = ctx->lo >> 16;





	ctx->buffer[59] = ctx->lo >> 24;

	ctx->buffer[60] = ctx->hi;
	ctx->buffer[61] = ctx->hi >> 8;
	ctx->buffer[62] = ctx->hi >> 16;
	ctx->buffer[63] = ctx->hi >> 24;

	body(ctx, ctx->buffer, 64);

	result[0] = ctx->a;
	result[1] = ctx->a >> 8;
	result[2] = ctx->a >> 16;
	result[3] = ctx->a >> 24;
	result[4] = ctx->b;
	result[5] = ctx->b >> 8;
	result[6] = ctx->b >> 16;
	result[7] = ctx->b >> 24;
	result[8] = ctx->c;

	result[9] = ctx->c >> 8;
	result[10] = ctx->c >> 16;
	result[11] = ctx->c >> 24;
	result[12] = ctx->d;
	result[13] = ctx->d >> 8;
	result[14] = ctx->d >> 16;
	result[15] = ctx->d >> 24;


	memset(ctx, 0, sizeof(*ctx));



}
/* MD5.C ENDS */

Changes to tools/file_sync.c. 

1
2
3
4
5
6
7
8
9

#include "compat.h"
#include "md4.h"
#include "net.h"

#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifndef HAVE_LIMITS_H
#include <limits.h>


|








1
2
3
4
5
6
7
8
9

#include "compat.h"
#include "md5.h"
#include "net.h"

#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifndef HAVE_LIMITS_H
#include <limits.h>
︙︙
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150


	DPRINTF("write_large_net(fd=%i, buf=%p, count=%lu) = %li", fd, buf, (unsigned long) count, (long) retval);

	return(retval);
}

int sync_transmit(const char *host, int port, const char *file, uint64_t blocksize) {
	rsaref_MD4_CTX mdctx;
	unsigned char md4buf[16];
	unsigned char *buf;
	uint64_t filesize;
	uint32_t blockok_size, blockidx;
	uint8_t *blockok, blockok_val;
	ssize_t read_ret, write_ret;
	off_t lseek_ret;
	off_t curpos, destpos;








|
|








135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150


	DPRINTF("write_large_net(fd=%i, buf=%p, count=%lu) = %li", fd, buf, (unsigned long) count, (long) retval);

	return(retval);
}

int sync_transmit(const char *host, int port, const char *file, uint64_t blocksize) {
	ld_MD5_CTX mdctx;
	unsigned char md5buf[16];
	unsigned char *buf;
	uint64_t filesize;
	uint32_t blockok_size, blockidx;
	uint8_t *blockok, blockok_val;
	ssize_t read_ret, write_ret;
	off_t lseek_ret;
	off_t curpos, destpos;
︙︙
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247

		}

		if (read_ret == 0) {
			CHECKPOINT;
			break;
		}

		rsaref_MD4Init(&mdctx);
		rsaref_MD4Update(&mdctx, buf, read_ret);
		rsaref_MD4Final(md4buf, &mdctx);

		write_ret = write_large_net(sockfd, md4buf, sizeof(md4buf));
		if (write_ret != sizeof(md4buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}
	}

	if (retval != -1) {








|
|
|

|
|








228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247

		}

		if (read_ret == 0) {
			CHECKPOINT;
			break;
		}

		ld_MD5Init(&mdctx);
		ld_MD5Update(&mdctx, buf, read_ret);
		ld_MD5Final(md5buf, &mdctx);

		write_ret = write_large_net(sockfd, md5buf, sizeof(md5buf));
		if (write_ret != sizeof(md5buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}
	}

	if (retval != -1) {
︙︙
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329

	close(fd);
	close(sockfd);

	return(retval);
}

int sync_receive(int port, const char *file) {
	rsaref_MD4_CTX mdctx;
	unsigned char md4buf[16], check_md4buf[16];
	unsigned char *buf;
	uint64_t filesize, filesize_s;
	uint64_t blocksize;
	uint32_t blockok_size, blockidx = 0;
	uint8_t *blockok, blockok_val;
	ssize_t cur_read_ret, read_ret, write_ret;
	size_t bytestowrite;








|
|








314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329

	close(fd);
	close(sockfd);

	return(retval);
}

int sync_receive(int port, const char *file) {
	ld_MD5_CTX mdctx;
	unsigned char md5buf[16], check_md5buf[16];
	unsigned char *buf;
	uint64_t filesize, filesize_s;
	uint64_t blocksize;
	uint32_t blockok_size, blockidx = 0;
	uint8_t *blockok, blockok_val;
	ssize_t cur_read_ret, read_ret, write_ret;
	size_t bytestowrite;
︙︙
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442

			memset(buf, '\0', bytestowrite);
			read_ret = bytestowrite;
			skipbytes = bytestowrite;
		} else {
			skipbytes = 0;
		}

		rsaref_MD4Init(&mdctx);
		rsaref_MD4Update(&mdctx, buf, read_ret);
		rsaref_MD4Final(md4buf, &mdctx);

		read_ret = read_large_net(sockfd, check_md4buf, sizeof(check_md4buf));
		if (read_ret != sizeof(check_md4buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}

		if (memcmp(check_md4buf, md4buf, sizeof(md4buf)) == 0) {
			blockok_val = 1;
		} else {
			blockok_val = 0;
		}

		if (i == 0 || i == 8) {
			if (i == 8) {








|
|
|

|
|





|








417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442

			memset(buf, '\0', bytestowrite);
			read_ret = bytestowrite;
			skipbytes = bytestowrite;
		} else {
			skipbytes = 0;
		}

		ld_MD5Init(&mdctx);
		ld_MD5Update(&mdctx, buf, read_ret);
		ld_MD5Final(md5buf, &mdctx);

		read_ret = read_large_net(sockfd, check_md5buf, sizeof(check_md5buf));
		if (read_ret != sizeof(check_md5buf)) {
			retval = -1;
			CHECKPOINT;
			break;
		}

		if (memcmp(check_md5buf, md5buf, sizeof(md5buf)) == 0) {
			blockok_val = 1;
		} else {
			blockok_val = 0;
		}

		if (i == 0 || i == 8) {
			if (i == 8) {
︙︙

Powered by Fossil · RSS