updated

TodoLodo · TodoLodo · commit 4baf3aec2ea2 · 2024-07-06T11:05:16.000+05:30
diff --git a/makefile b/makefile
@@ -8,7 +8,7 @@ ifeq ($(OS),Windows_NT)
 	MV = move
 	SEP = \\
 else
-	RM = $(RM) -f
+	RM = rm -f
 	MV = mv
 	SEP = /
 endif
@@ -43,37 +43,40 @@ else
 endif
 
 # Default target
-all: build static test
+all: _shared _static _build _test clean_o
 
 # Build target for src/md files
-build: $(MD_BIN_FILES)
+_build: $(MD_BIN_FILES)
+build : _build clean_o
 
 # Rule to compile each .c file in src/md into its corresponding binary
 $(BIN_DIR)/%: $(SRC_MD_DIR)/%.c | $(BIN_DIR) $(STATIC_LIB)
 	$(CC) $(CFLAGS) -L$(LIB_DIR) -o $@ $< -lm -lmd
 
 # Build target for static library
-static: $(STATIC_LIB)
+_static: $(STATIC_LIB)
+static : _static clean_o
 
 # Rule to create the static library from src/rfc files
 $(STATIC_LIB): $(RFC_OBJ_FILES) | $(LIB_DIR)
 	ar rcs $@ $(RFC_OBJ_FILES)
-	$(RM) $(subst /,$(SEP),$(RFC_OBJ_FILES))
 
 # Build target for shared library
-shared : $(SHARED_LIB)
+_shared: $(SHARED_LIB)
+shared : _shared clean_o
 
 # Rule to create the shared library from src/rfc files
 $(SHARED_LIB): $(RFC_OBJ_FILES) | $(LIB_DIR)
 	$(CC) -shared -o $@ $(RFC_OBJ_FILES)
-	$(RM) $(subst /,$(SEP),$(RFC_OBJ_FILES))
+	
 
 # Rule to compile each .c file in src/rfc into position-independent code (.o files)
 $(SRC_RFC_DIR)/%.o: $(SRC_RFC_DIR)/%.c
 	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
 
 # Build target for test files
-test: $(TEST_BIN_FILES)
+_test: $(TEST_BIN_FILES)
+test : _test clean_o
 
 # Rule to compile each .c file in test into its corresponding binary
 $(BIN_DIR)/%: $(TEST_DIR)/%.c | $(BIN_DIR) $(STATIC_LIB)
@@ -91,4 +94,8 @@ $(LIB_DIR):
 clean:
 	$(RM) $(subst /,$(SEP),$(BIN_DIR)/* $(LIB_DIR)/* $(SRC_RFC_DIR)/*.o)
 
-.PHONY: all build static test clean
+# Clean target to remove compiled binaries and libraries
+clean_o:
+	$(RM) $(subst /,$(SEP),$(SRC_RFC_DIR)/*.o)
+
+.PHONY: all build static shared test clean
diff --git a/src/rfc/rfc1320.c b/src/rfc/rfc1320.c
@@ -127,6 +127,7 @@ uint8_t *MD4(uint8_t *message, uint64_t message_len, uint8_t *digest)
 		C += CC;
 		D += DD;
 	}
+	printf("F >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 	uint32_t ABCD[] = {A, B, C, D};
 
diff --git a/src/rfc/rfc1321.c b/src/rfc/rfc1321.c
@@ -61,91 +61,109 @@ uint8_t *MD5(uint8_t *message, uint64_t message_len, uint8_t *digest)
 		_a5(&D, A, B, C, 1, 12, 2, F, X);
 		_a5(&C, D, A, B, 2, 17, 3, F, X);
 		_a5(&B, C, D, A, 3, 22, 4, F, X);
+		printf("1 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 4, 7, 5, F, X);
 		_a5(&D, A, B, C, 5, 12, 6, F, X);
 		_a5(&C, D, A, B, 6, 17, 7, F, X);
 		_a5(&B, C, D, A, 7, 22, 8, F, X);
+		printf("1 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 8, 7, 9, F, X);
 		_a5(&D, A, B, C, 9, 12, 10, F, X);
 		_a5(&C, D, A, B, 10, 17, 11, F, X);
 		_a5(&B, C, D, A, 11, 22, 12, F, X);
+		printf("1 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 12, 7, 13, F, X);
 		_a5(&D, A, B, C, 13, 12, 14, F, X);
 		_a5(&C, D, A, B, 14, 17, 15, F, X);
 		_a5(&B, C, D, A, 15, 22, 16, F, X);
+		printf("1 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		// Round 2
 		_a5(&A, B, C, D, 1, 5, 17, G, X);
 		_a5(&D, A, B, C, 6, 9, 18, G, X);
 		_a5(&C, D, A, B, 11, 14, 19, G, X);
 		_a5(&B, C, D, A, 0, 20, 20, G, X);
+		printf("2 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 5, 5, 21, G, X);
 		_a5(&D, A, B, C, 10, 9, 22, G, X);
 		_a5(&C, D, A, B, 15, 14, 23, G, X);
 		_a5(&B, C, D, A, 4, 20, 24, G, X);
+		printf("2 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 9, 5, 25, G, X);
 		_a5(&D, A, B, C, 14, 9, 26, G, X);
 		_a5(&C, D, A, B, 3, 14, 27, G, X);
 		_a5(&B, C, D, A, 8, 20, 28, G, X);
+		printf("2 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 13, 5, 29, G, X);
 		_a5(&D, A, B, C, 2, 9, 30, G, X);
 		_a5(&C, D, A, B, 7, 14, 31, G, X);
 		_a5(&B, C, D, A, 12, 20, 32, G, X);
+		printf("2 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		// Round 3
 		_a5(&A, B, C, D, 5, 4, 33, H, X);
 		_a5(&D, A, B, C, 8, 11, 34, H, X);
 		_a5(&C, D, A, B, 11, 16, 35, H, X);
 		_a5(&B, C, D, A, 14, 23, 36, H, X);
+		printf("3 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 1, 4, 37, H, X);
 		_a5(&D, A, B, C, 4, 11, 38, H, X);
 		_a5(&C, D, A, B, 7, 16, 39, H, X);
 		_a5(&B, C, D, A, 10, 23, 40, H, X);
+		printf("3 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 13, 4, 41, H, X);
 		_a5(&D, A, B, C, 0, 11, 42, H, X);
 		_a5(&C, D, A, B, 3, 16, 43, H, X);
 		_a5(&B, C, D, A, 6, 23, 44, H, X);
+		printf("3 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 9, 4, 45, H, X);
 		_a5(&D, A, B, C, 12, 11, 46, H, X);
 		_a5(&C, D, A, B, 15, 16, 47, H, X);
 		_a5(&B, C, D, A, 2, 23, 48, H, X);
+		printf("3 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		// Round 4
 		_a5(&A, B, C, D, 0, 6, 49, I, X);
 		_a5(&D, A, B, C, 7, 10, 50, I, X);
 		_a5(&C, D, A, B, 14, 15, 51, I, X);
 		_a5(&B, C, D, A, 5, 21, 52, I, X);
+		printf("4 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 12, 6, 53, I, X);
 		_a5(&D, A, B, C, 3, 10, 54, I, X);
 		_a5(&C, D, A, B, 10, 15, 55, I, X);
 		_a5(&B, C, D, A, 1, 21, 56, I, X);
+		printf("4 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 8, 6, 57, I, X);
 		_a5(&D, A, B, C, 15, 10, 58, I, X);
 		_a5(&C, D, A, B, 6, 15, 59, I, X);
 		_a5(&B, C, D, A, 13, 21, 60, I, X);
+		printf("4 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		_a5(&A, B, C, D, 4, 6, 61, I, X);
 		_a5(&D, A, B, C, 11, 10, 62, I, X);
 		_a5(&C, D, A, B, 2, 15, 63, I, X);
 		_a5(&B, C, D, A, 9, 21, 64, I, X);
+		printf("4 >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
 
 		A += AA;
 		B += BB;
 		C += CC;
 		D += DD;
 	}
 
+	printf("F >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);
+
 	uint32_t ABCD[] = {A, B, C, D};
 
 	for (size_t i = 0; i < 4; ++i)
diff --git a/test/test_all.c b/test/test_all.c
@@ -35,6 +35,13 @@ int main()
 		{0x5e, 0x4c, 0x4d, 0x1b, 0xe9, 0xb0, 0xfe, 0x14, 0x2b, 0xb6, 0x78, 0x27, 0xc2, 0x19, 0xa7, 0x95},
 		{0xcd, 0x4c, 0xd8, 0x8a, 0xac, 0x34, 0xf8, 0x26, 0xab, 0x00, 0x5d, 0x00, 0xf8, 0x14, 0x1e, 0xc1}};
 
+	uint8_t md5_expecteds[][16] = {
+		{0x0c, 0xc1, 0x75, 0xb9, 0xc0, 0xf1, 0xb6, 0xa8, 0x31, 0xc3, 0x99, 0xe2, 0x69, 0x77, 0x26, 0x61},
+		{0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72},
+		{0xd0, 0xcf, 0x3d, 0x6c, 0xee, 0xc4, 0xad, 0xfc, 0x5e, 0x57, 0xf9, 0xb4, 0x88, 0x88, 0x35, 0xd0},
+		{0x8c, 0x4d, 0x8f, 0x13, 0x5c, 0xba, 0xbe, 0x82, 0x8c, 0x2e, 0x14, 0x0c, 0x32, 0x8b, 0xe3, 0xd0},
+		{0xa9, 0x82, 0xc1, 0x34, 0x93, 0xc5, 0x39, 0x96, 0x0f, 0x6f, 0xf3, 0xb9, 0x66, 0x21, 0xfd, 0x64}};
+
 	uint8_t md2_digest[MD2_DIGEST_LENGTH];
 	uint8_t md4_digest[MD4_DIGEST_LENGTH];
 	uint8_t md5_digest[MD5_DIGEST_LENGTH];
@@ -77,13 +84,13 @@ int main()
 		printf("\n");
 		printf("message : %s\n", messages[i]);
 		printf("expected: ");
-		print_hex(md4_expecteds[i], 16);
+		print_hex(md5_expecteds[i], 16);
 		printf("\n");
 		MD5(messages[i], strlen((char *)messages[i]), md5_digest);
 		printf("output  : ");
-		print_hex(md4_digest, 16);
+		print_hex(md5_digest, 16);
 		printf("\n");
-		printf("matches?: %s\n", memcmp(md5_digest, md4_expecteds[i], 16) ? "false" : "true");
+		printf("matches?: %s\n", memcmp(md5_digest, md5_expecteds[i], 16) ? "false" : "true");
 	}
 	printf("\n===============\n");
 

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ uint8_t MD4(uint8_t message, uint64_t message_len, uint8_t *digest)`
`127`	`127`	`C += CC;`
`128`	`128`	`D += DD;`
`129`	`129`	`}`
	`130`	`+ printf("F >> A: %08X B: %08X C: %08X D: %08X\n", A, B, C, D);`
`130`	`131`
`131`	`132`	`uint32_t ABCD[] = {A, B, C, D};`
`132`	`133`