diff --git a/Makefile.am b/Makefile.am index 1b2a2c28f..acf567ef8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,6 @@ SOURCES=\ source/mode.c\ source/keyb.c\ config/config.c\ - source/md5.c\ source/helper.c\ source/timings.c\ source/history.c\ @@ -97,7 +96,6 @@ SOURCES=\ include/rofi.h\ include/rofi-types.h\ include/rofi-icon-fetcher.h\ - include/md5.h\ include/mode.h\ include/mode-private.h\ include/settings.h\ diff --git a/include/md5.h b/include/md5.h deleted file mode 100644 index 491366c1a..000000000 --- a/include/md5.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef MD5_H -#define MD5_H - -/* -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. -*/ - -#include -#include -#include -#include - -typedef struct{ - uint64_t size; // Size of input in bytes - uint32_t buffer[4]; // Current accumulation of hash - uint8_t input[64]; // Input to be used in the next step - uint8_t digest[16]; // Result of algorithm -}MD5Context; - -uint32_t rotateLeft(uint32_t x, uint32_t n); - -void md5Init(MD5Context *ctx); -void md5Update(MD5Context *ctx, uint8_t *input, size_t input_len); -void md5Finalize(MD5Context *ctx); -void md5Step(uint32_t *buffer, uint32_t *input); - -void md5String(char *input, uint8_t *result); -void md5File(FILE *file, uint8_t *result); - -#endif diff --git a/source/md5.c b/source/md5.c deleted file mode 100644 index f79a427b7..000000000 --- a/source/md5.c +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm - * and modified slightly to be functionally identical but condensed into control structures. - */ - -#include "md5.h" - -/* - * Constants defined by the MD5 algorithm - */ -#define A 0x67452301 -#define B 0xefcdab89 -#define C 0x98badcfe -#define D 0x10325476 - -static uint32_t S[] = {7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, - 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, - 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, - 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21}; - -static uint32_t K[] = {0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, - 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, - 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, - 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, - 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, - 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, - 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, - 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, - 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, - 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, - 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, - 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, - 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, - 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, - 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, - 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391}; - -/* - * Padding used to make the size (in bits) of the input congruent to 448 mod 512 - */ -static uint8_t PADDING[] = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - -/* - * Bit-manipulation functions defined by the MD5 algorithm - */ -#define F(X, Y, Z) ((X & Y) | (~X & Z)) -#define G(X, Y, Z) ((X & Z) | (Y & ~Z)) -#define H(X, Y, Z) (X ^ Y ^ Z) -#define I(X, Y, Z) (Y ^ (X | ~Z)) - -/* - * Rotates a 32-bit word left by n bits - */ -uint32_t rotateLeft(uint32_t x, uint32_t n){ - return (x << n) | (x >> (32 - n)); -} - - -/* - * Initialize a context - */ -void md5Init(MD5Context *ctx){ - ctx->size = (uint64_t)0; - - ctx->buffer[0] = (uint32_t)A; - ctx->buffer[1] = (uint32_t)B; - ctx->buffer[2] = (uint32_t)C; - ctx->buffer[3] = (uint32_t)D; -} - -/* - * Add some amount of input to the context - * - * If the input fills out a block of 512 bits, apply the algorithm (md5Step) - * and save the result in the buffer. Also updates the overall size. - */ -void md5Update(MD5Context *ctx, uint8_t *input_buffer, size_t input_len){ - uint32_t input[16]; - unsigned int offset = ctx->size % 64; - ctx->size += (uint64_t)input_len; - - // Copy each byte in input_buffer into the next space in our context input - for(unsigned int i = 0; i < input_len; ++i){ - ctx->input[offset++] = (uint8_t)*(input_buffer + i); - - // If we've filled our context input, copy it into our local array input - // then reset the offset to 0 and fill in a new buffer. - // Every time we fill out a chunk, we run it through the algorithm - // to enable some back and forth between cpu and i/o - if(offset % 64 == 0){ - for(unsigned int j = 0; j < 16; ++j){ - // Convert to little-endian - // The local variable `input` our 512-bit chunk separated into 32-bit words - // we can use in calculations - input[j] = (uint32_t)(ctx->input[(j * 4) + 3]) << 24 | - (uint32_t)(ctx->input[(j * 4) + 2]) << 16 | - (uint32_t)(ctx->input[(j * 4) + 1]) << 8 | - (uint32_t)(ctx->input[(j * 4)]); - } - md5Step(ctx->buffer, input); - offset = 0; - } - } -} - -/* - * Pad the current input to get to 448 bytes, append the size in bits to the very end, - * and save the result of the final iteration into digest. - */ -void md5Finalize(MD5Context *ctx){ - uint32_t input[16]; - unsigned int offset = ctx->size % 64; - unsigned int padding_length = offset < 56 ? 56 - offset : (56 + 64) - offset; - - // Fill in the padding and undo the changes to size that resulted from the update - md5Update(ctx, PADDING, padding_length); - ctx->size -= (uint64_t)padding_length; - - // Do a final update (internal to this function) - // Last two 32-bit words are the two halves of the size (converted from bytes to bits) - for(unsigned int j = 0; j < 14; ++j){ - input[j] = (uint32_t)(ctx->input[(j * 4) + 3]) << 24 | - (uint32_t)(ctx->input[(j * 4) + 2]) << 16 | - (uint32_t)(ctx->input[(j * 4) + 1]) << 8 | - (uint32_t)(ctx->input[(j * 4)]); - } - input[14] = (uint32_t)(ctx->size * 8); - input[15] = (uint32_t)((ctx->size * 8) >> 32); - - md5Step(ctx->buffer, input); - - // Move the result into digest (convert from little-endian) - for(unsigned int i = 0; i < 4; ++i){ - ctx->digest[(i * 4) + 0] = (uint8_t)((ctx->buffer[i] & 0x000000FF)); - ctx->digest[(i * 4) + 1] = (uint8_t)((ctx->buffer[i] & 0x0000FF00) >> 8); - ctx->digest[(i * 4) + 2] = (uint8_t)((ctx->buffer[i] & 0x00FF0000) >> 16); - ctx->digest[(i * 4) + 3] = (uint8_t)((ctx->buffer[i] & 0xFF000000) >> 24); - } -} - -/* - * Step on 512 bits of input with the main MD5 algorithm. - */ -void md5Step(uint32_t *buffer, uint32_t *input){ - uint32_t AA = buffer[0]; - uint32_t BB = buffer[1]; - uint32_t CC = buffer[2]; - uint32_t DD = buffer[3]; - - uint32_t E; - - unsigned int j; - - for(unsigned int i = 0; i < 64; ++i){ - switch(i / 16){ - case 0: - E = F(BB, CC, DD); - j = i; - break; - case 1: - E = G(BB, CC, DD); - j = ((i * 5) + 1) % 16; - break; - case 2: - E = H(BB, CC, DD); - j = ((i * 3) + 5) % 16; - break; - default: - E = I(BB, CC, DD); - j = (i * 7) % 16; - break; - } - - uint32_t temp = DD; - DD = CC; - CC = BB; - BB = BB + rotateLeft(AA + E + K[i] + input[j], S[i]); - AA = temp; - } - - buffer[0] += AA; - buffer[1] += BB; - buffer[2] += CC; - buffer[3] += DD; -} - -/* - * Functions that run the algorithm on the provided input and put the digest into result. - * result should be able to store 16 bytes. - */ -void md5String(char *input, uint8_t *result){ - MD5Context ctx; - md5Init(&ctx); - md5Update(&ctx, (uint8_t *)input, strlen(input)); - md5Finalize(&ctx); - - memcpy(result, ctx.digest, 16); -} - -void md5File(FILE *file, uint8_t *result){ - char *input_buffer = malloc(1024); - size_t input_size = 0; - - MD5Context ctx; - md5Init(&ctx); - - while((input_size = fread(input_buffer, 1, 1024, file)) > 0){ - md5Update(&ctx, (uint8_t *)input_buffer, input_size); - } - - md5Finalize(&ctx); - - free(input_buffer); - - memcpy(result, ctx.digest, 16); -} diff --git a/source/rofi-icon-fetcher.c b/source/rofi-icon-fetcher.c index db54e5391..27310d0da 100644 --- a/source/rofi-icon-fetcher.c +++ b/source/rofi-icon-fetcher.c @@ -51,8 +51,6 @@ #include "helper.h" #include -#include "md5.h" - // thumbnailers key file's group and file extension #define THUMBNAILER_ENTRY_GROUP "Thumbnailer Entry" #define THUMBNAILER_EXTENSION ".thumbnailer" @@ -453,35 +451,14 @@ gboolean rofi_icon_fetcher_file_is_image(const char *const path) { return FALSE; } -// https://stackoverflow.com/questions/57723372/cast-uint8-t-to-hex-string-2-digits/57723618#57723618 -static int md5_to_hex(char* dest, size_t dest_len, const uint8_t* values, - size_t val_len) { - static const char hex_table[] = "0123456789abcdef"; - if(dest_len < (val_len*2+1)) /* check that dest is large enough */ - return 0; - while(val_len--) { - /* shift down the top nibble and pick a char from the hex_table */ - *dest++ = hex_table[*values >> 4]; - /* extract the bottom nibble and pick a char from the hex_table */ - *dest++ = hex_table[*values++ & 0xF]; - } - *dest = 0; - return 1; -} - // build thumbnail's path using md5 hash of an entry name static gchar* rofi_icon_fetcher_get_thumbnail(gchar* name, int requested_size, int *thumb_size) { // calc entry_name md5 hash - int md5_size = 16; - uint8_t md5[md5_size]; - md5String(name, md5); - - // convert md5 hash to hex string - int hex_size = md5_size * 2 + 1; - char md5_hex[hex_size]; - md5_to_hex(md5_hex, hex_size, md5, md5_size); + GChecksum* checksum = g_checksum_new(G_CHECKSUM_MD5); + g_checksum_update(checksum, (guchar*)name, -1); + const gchar *md5_hex = g_checksum_get_string(checksum); // determine thumbnail folder based on the request size const gchar* cache_dir = g_get_user_cache_dir(); @@ -504,6 +481,8 @@ static gchar* rofi_icon_fetcher_get_thumbnail(gchar* name, thumb_path = g_strconcat(cache_dir, "/thumbnails/xx-large/", md5_hex, ".png", NULL); } + + g_checksum_free(checksum); return thumb_path; }