This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 9387d94b30677bffb2875b6a7e516d754b92d2d5
Author: Vincent Torri <vto...@outlook.fr>
AuthorDate: Tue Oct 3 08:50:36 2023 +0200
use eina_sha1() instead of duplicated code
---
src/lib/efreet/efreet_cache.c | 87 +------------------------------------------
1 file changed, 1 insertion(+), 86 deletions(-)
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index e4075e751e..681ea1f1aa 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -545,91 +545,6 @@ efreet_desktop_util_cache_file(void)
/*
* Needs EAPI because of helper binaries
*/
-#define SHSH(n, v) ((((v) << (n)) & 0xffffffff) | ((v) >> (32 - (n))))
-
-static inline int
-int_to_bigendian(int in)
-{
- static const unsigned char test[4] = { 0x11, 0x22, 0x33, 0x44 };
- static const unsigned int *test_i = (const unsigned int *)test;
- if (test_i[0] == 0x44332211) return eina_swap32(in);
- return in;
-}
-
-static void
-sha1(unsigned char *data, int size, unsigned char *dst)
-{
- unsigned int digest[5], word[80], wa, wb, wc, wd, we, t;
- unsigned char buf[64], *d;
- int idx, left, i;
- const unsigned int magic[4] =
- { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
-
- idx = 0;
- digest[0] = 0x67452301; digest[1] = 0xefcdab89; digest[2] = 0x98badcfe;
- digest[3] = 0x10325476; digest[4] = 0xc3d2e1f0;
-
- memset(buf, 0, sizeof(buf));
- for (left = size, d = data; left > 0; left--, d++)
- {
- if ((idx == 0) && (left < 64))
- {
- memset(buf, 0, 60);
- buf[60] = (size >> 24) & 0xff;
- buf[61] = (size >> 16) & 0xff;
- buf[62] = (size >> 8) & 0xff;
- buf[63] = (size) & 0xff;
- }
- buf[idx] = *d;
- idx++;
- if ((idx == 64) || (left == 1))
- {
- if ((left == 1) && (idx < 64)) buf[idx] = 0x80;
- for (i = 0; i < 16; i++)
- {
- word[i] = (unsigned int)buf[(i * 4) ] << 24;
- word[i] |= (unsigned int)buf[(i * 4) + 1] << 16;
- word[i] |= (unsigned int)buf[(i * 4) + 2] << 8;
- word[i] |= (unsigned int)buf[(i * 4) + 3];
- }
- for (i = 16; i < 80; i++)
- word[i] = SHSH(1,
- word[i - 3 ] ^ word[i - 8 ] ^
- word[i - 14] ^ word[i - 16]);
- wa = digest[0]; wb = digest[1]; wc = digest[2];
- wd = digest[3]; we = digest[4];
- for (i = 0; i < 80; i++)
- {
- if (i < 20)
- t = SHSH(5, wa) + ((wb & wc) | ((~wb) & wd)) +
- we + word[i] + magic[0];
- else if (i < 40)
- t = SHSH(5, wa) + (wb ^ wc ^ wd) +
- we + word[i] + magic[1];
- else if (i < 60)
- t = SHSH(5, wa) + ((wb & wc) | (wb & wd) | (wc & wd)) +
- we + word[i] + magic[2];
- else if (i < 80)
- t = SHSH(5, wa) + (wb ^ wc ^ wd) +
- we + word[i] + magic[3];
- we = wd;
- wd = wc;
- wc = SHSH(30, wb);
- wb = wa;
- wa = t;
- }
- digest[0] += wa; digest[1] += wb; digest[2] += wc;
- digest[3] += wd; digest[4] += we;
- idx = 0;
- }
- }
- t = int_to_bigendian(digest[0]); digest[0] = t;
- t = int_to_bigendian(digest[1]); digest[1] = t;
- t = int_to_bigendian(digest[2]); digest[2] = t;
- t = int_to_bigendian(digest[3]); digest[3] = t;
- t = int_to_bigendian(digest[4]); digest[4] = t;
- memcpy(dst, digest, 5 * 4);
-}
EAPI Eina_Bool
efreet_file_cache_fill(const char *file, Efreet_Cache_Check *check)
@@ -651,7 +566,7 @@ efreet_file_cache_fill(const char *file, Efreet_Cache_Check *check)
if ((size > 0) && ((size_t)size >= sizeof(link))) return EINA_FALSE;
if (stat(file, &st) != 0) return EINA_FALSE;
}
- if (size > 0) sha1((unsigned char *)link, size, check->link_sha1);
+ if (size > 0) eina_sha1((const unsigned char *)link, size, check->link_sha1);
#endif
check->uid = st.st_uid;
check->gid = st.st_gid;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
