Added hash function computation compatible with openssl 3.0

This commit is contained in:
alessandro ferro 2023-04-27 17:20:54 +02:00
parent 046ff8b3cd
commit 8bce8f5e67
1 changed files with 60 additions and 12 deletions

View File

@ -90,7 +90,7 @@ struct arguments get_arguments(int argc, char **argv)
} }
/// @brief Checks if two directories are equivalent. /// @brief Checks if two directories are equivalent.
/// @param directory_to_analyze_1 Name of the first directory. Will be free-d before the call terminates /// @param directory_to_analyze_1 Name of the first directory. Will be free-d before the call terminates
/// @param directory_to_analyze_2 Name of the second directory. Will be free-d before the call terminates /// @param directory_to_analyze_2 Name of the second directory. Will be free-d before the call terminates
/// @param arguments Arguments passed to dircomp /// @param arguments Arguments passed to dircomp
/// @return true if the directories are equivalent, false otherwise /// @return true if the directories are equivalent, false otherwise
@ -117,7 +117,7 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
free(directory_to_analyze_2); free(directory_to_analyze_2);
return false; return false;
} }
while ((element = readdir(directory1)) != NULL) while ((element = readdir(directory1)) != NULL)
{ {
// Is file // Is file
@ -129,7 +129,7 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
{ {
is_directory_equal = false; is_directory_equal = false;
if (arguments->v) if (arguments->v)
printf("File %s exists in %s but does not in %s\n" , element->d_name printf("File %s exists in %s but does not in %s\n" , element->d_name
, directory_to_analyze_1 , directory_to_analyze_1
, directory_to_analyze_2); , directory_to_analyze_2);
free(fullpath_helper); free(fullpath_helper);
@ -145,7 +145,7 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
else else
file_equality_result = hash_by_hash_file_comparison(fullpath_helper, fullpath_helper2); file_equality_result = hash_by_hash_file_comparison(fullpath_helper, fullpath_helper2);
if (file_equality_result != 1) if (file_equality_result != 1)
{ {
is_directory_equal = false; is_directory_equal = false;
@ -251,10 +251,10 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
} }
} }
closedir(directory2); closedir(directory2);
free(directory_to_analyze_1); free(directory_to_analyze_1);
free(directory_to_analyze_2); free(directory_to_analyze_2);
return is_directory_equal; return is_directory_equal;
} }
@ -305,8 +305,8 @@ int byte_by_byte_file_comparison(char* filename1, char* filename2)
} }
/// @brief Checks if two files contain the same data (by comparing the resulting SHA-1 hash) /// @brief Checks if two files contain the same data (by comparing the resulting SHA-1 hash)
/// @param filename1 /// @param filename1
/// @param filename2 /// @param filename2
/// @return Returns 1 if the files are the same, 0 otherwise, -1 if an error occurred /// @return Returns 1 if the files are the same, 0 otherwise, -1 if an error occurred
int hash_by_hash_file_comparison(char* filename1, char* filename2) int hash_by_hash_file_comparison(char* filename1, char* filename2)
{ {
@ -355,9 +355,57 @@ unsigned char* sha1(char *filename)
return hash; return hash;
} }
unsigned char* sha1_openssl3(char *filename){
EVP_MD_CTX *mdctx; // envelope context
const EVP_MD *md; // envelope mode (SHA1)
unsigned char *hash = malloc(EVP_MAX_MD_SIZE * sizeof(unsigned char)); // result will be here
unsigned int digest_len, i;
FILE *f = fopen(filename, "rb");
if (f == NULL)
{
fprintf(stderr, "Couldn't open %s\n", filename);
return NULL;
}
mdctx = EVP_MD_CTX_new();
if (mdctx == NULL) {
return NULL;
}
md = EVP_sha1();
if (!EVP_DigestInit_ex(mdctx, md, NULL)) {
return NULL;
}
#define BYTES_TO_READ_AT_ONCE 512000 // 500KiB
unsigned int bytes; // how many bytes we have actually read from fread
#if BYTES_TO_READ_AT_ONCE > UINT_MAX
#error Trying to read more bytes than what is possible to handle. Recompile using unsigned long or reduce BYTES_TO_READ_AT_ONCE
#endif
unsigned char databuffer[BYTES_TO_READ_AT_ONCE];
while ((bytes = fread(databuffer, 1, BYTES_TO_READ_AT_ONCE, f)) != 0)
{
if (!EVP_DigestUpdate(mdctx, databuffer, bytes)) {
return NULL;
}
}
if (!EVP_DigestFinal_ex(mdctx, hash, &digest_len)) {
return NULL;
}
EVP_MD_CTX_free(mdctx);
// print the result in hexadecimal format
for (i = 0; i < digest_len; i++) {
printf("%02x", hash[i]);
}
fclose(f);
return hash;
}
/// @brief Combines two paths /// @brief Combines two paths
/// @param path1 /// @param path1
/// @param path2 /// @param path2
/// @return Pointer to the new path /// @return Pointer to the new path
char* combine_path(char* path1, char* path2){ char* combine_path(char* path1, char* path2){
char* path = malloc(sizeof(char) * (strlen(path1) + strlen(path2) + 2) ); char* path = malloc(sizeof(char) * (strlen(path1) + strlen(path2) + 2) );
@ -368,7 +416,7 @@ char* combine_path(char* path1, char* path2){
} }
/// @brief Output of the command 'dircomp -h' /// @brief Output of the command 'dircomp -h'
/// @param /// @param
void print_help(void) void print_help(void)
{ {
printf("usage: dircomp directory1 directory2 [-rvfbh]\n"); printf("usage: dircomp directory1 directory2 [-rvfbh]\n");
@ -377,4 +425,4 @@ void print_help(void)
printf(" -f \t\t Fast. Halt as soon as the directories are found to be not equal\n"); printf(" -f \t\t Fast. Halt as soon as the directories are found to be not equal\n");
printf(" -b \t\t Byte-by-byte file comparison (default compares their hashes)\n"); printf(" -b \t\t Byte-by-byte file comparison (default compares their hashes)\n");
printf(" -h \t\t Print this help and quit\n"); printf(" -h \t\t Print this help and quit\n");
} }