Index: uspace/lib/ext4/libext4_crc.c =================================================================== --- uspace/lib/ext4/libext4_crc.c (revision 0a586f4c9bfafe682793df920734f321031dad5a) +++ uspace/lib/ext4/libext4_crc.c (revision 466e95f7c1e1804072fe2965ba7a828e95259ed5) @@ -33,78 +33,12 @@ /** * @file libext4_crc.c - * @brief CRC checksumming implementation from Linux. */ -#include #include "libext4.h" -/** CRC table for the CRC-16. - * - * The poly is 0x8005 (x^16 + x^15 + x^2 + 1). - * - */ -uint16_t const crc16_table[256] = { - 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, - 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, - 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, - 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, - 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, - 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, - 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, - 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, - 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, - 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, - 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, - 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, - 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, - 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, - 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, - 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, - 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, - 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, - 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, - 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, - 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, - 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, - 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640, - 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, - 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, - 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, - 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, - 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, - 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, - 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, - 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, - 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 -}; - -/** Modify CRC value. - * - * @param crc Current CRC value - * @param data New byte of data to be "added" to CRC - * - * @return Updated CRC value - * - */ -static inline uint16_t crc16_byte(uint16_t crc, const uint8_t data) -{ - return (crc >> 8) ^ crc16_table[(crc ^ data) & 0xff]; -} - -/** Compute the CRC-16 for the data buffer. - * - * @param crc Previous CRC value - * @param buffer Data pointer - * @param len Number of bytes in the buffer - * - * @return Updated CRC value - * - */ uint16_t crc16(uint16_t crc, const uint8_t *buffer, size_t len) { - while (len--) - crc = crc16_byte(crc, *buffer++); - - return crc; + // TODO + return 0; } Index: uspace/lib/ext4/libext4_filesystem.c =================================================================== --- uspace/lib/ext4/libext4_filesystem.c (revision 0a586f4c9bfafe682793df920734f321031dad5a) +++ uspace/lib/ext4/libext4_filesystem.c (revision 466e95f7c1e1804072fe2965ba7a828e95259ed5) @@ -471,6 +471,4 @@ /** Compute checksum of block group descriptor. - * - * It uses crc functions from Linux kernel implementation. * * @param sb Superblock Index: uspace/lib/ext4/libext4_hash.c =================================================================== --- uspace/lib/ext4/libext4_hash.c (revision 0a586f4c9bfafe682793df920734f321031dad5a) +++ uspace/lib/ext4/libext4_hash.c (revision 466e95f7c1e1804072fe2965ba7a828e95259ed5) @@ -35,285 +35,12 @@ */ +#include "libext4.h" #include -#include -#include "libext4.h" -#define TEA_DELTA 0x9E3779B9 - -/* F, G and H are basic MD4 functions: selection, majority, parity */ -#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z)))) -#define G(x, y, z) (((x) & (y)) + (((x) ^ (y)) & (z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) - -/* - * The generic round function. The application is so specific that - * we don't bother protecting all the arguments with parens, as is generally - * good macro practice, in favor of extra legibility. - * Rotation is separate from addition to prevent recomputation - */ -#define ROUND(f, a, b, c, d, x, s) \ - (a += f(b, c, d) + x, a = (a << s) | (a >> (32 - s))) - -#define K1 0 -#define K2 013240474631UL -#define K3 015666365641UL - -static void tea_transform(uint32_t buf[4], uint32_t const in[]) -{ - uint32_t sum = 0; - uint32_t b0 = buf[0]; - uint32_t b1 = buf[1]; - uint32_t a = in[0]; - uint32_t b = in[1]; - uint32_t c = in[2]; - uint32_t d = in[3]; - - int n = 16; - - do { - sum += TEA_DELTA; - b0 += ((b1 << 4) + a) ^ (b1 + sum) ^ ((b1 >> 5) + b); - b1 += ((b0 << 4) + c) ^ (b0 + sum) ^ ((b0 >> 5) + d); - } while (--n); - - buf[0] += b0; - buf[1] += b1; -} - - -static void half_md4_transform(uint32_t buf[4], const uint32_t in[8]) -{ - uint32_t a = buf[0], b = buf[1], c = buf[2], d = buf[3]; - - /* Round 1 */ - ROUND(F, a, b, c, d, in[0] + K1, 3); - ROUND(F, d, a, b, c, in[1] + K1, 7); - ROUND(F, c, d, a, b, in[2] + K1, 11); - ROUND(F, b, c, d, a, in[3] + K1, 19); - ROUND(F, a, b, c, d, in[4] + K1, 3); - ROUND(F, d, a, b, c, in[5] + K1, 7); - ROUND(F, c, d, a, b, in[6] + K1, 11); - ROUND(F, b, c, d, a, in[7] + K1, 19); - - /* Round 2 */ - ROUND(G, a, b, c, d, in[1] + K2, 3); - ROUND(G, d, a, b, c, in[3] + K2, 5); - ROUND(G, c, d, a, b, in[5] + K2, 9); - ROUND(G, b, c, d, a, in[7] + K2, 13); - ROUND(G, a, b, c, d, in[0] + K2, 3); - ROUND(G, d, a, b, c, in[2] + K2, 5); - ROUND(G, c, d, a, b, in[4] + K2, 9); - ROUND(G, b, c, d, a, in[6] + K2, 13); - - /* Round 3 */ - ROUND(H, a, b, c, d, in[3] + K3, 3); - ROUND(H, d, a, b, c, in[7] + K3, 9); - ROUND(H, c, d, a, b, in[2] + K3, 11); - ROUND(H, b, c, d, a, in[6] + K3, 15); - ROUND(H, a, b, c, d, in[1] + K3, 3); - ROUND(H, d, a, b, c, in[5] + K3, 9); - ROUND(H, c, d, a, b, in[0] + K3, 11); - ROUND(H, b, c, d, a, in[4] + K3, 15); - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; -} - -static uint32_t hash_unsigned(const char *name, int len) -{ - uint32_t hash; - uint32_t hash0 = 0x12a3fe2d; - uint32_t hash1 = 0x37abe8f9; - const unsigned char *ucp = (const unsigned char *) name; - - while (len--) { - hash = hash1 + (hash0 ^ (((int) *ucp++) * 7152373)); - - if (hash & 0x80000000) - hash -= 0x7fffffff; - - hash1 = hash0; - hash0 = hash; - } - - return hash0 << 1; -} - -static uint32_t hash_signed(const char *name, int len) -{ - uint32_t hash; - uint32_t hash0 = 0x12a3fe2d; - uint32_t hash1 = 0x37abe8f9; - const signed char *scp = (const signed char *) name; - - while (len--) { - hash = hash1 + (hash0 ^ (((int) *scp++) * 7152373)); - - if (hash & 0x80000000) - hash -= 0x7fffffff; - - hash1 = hash0; - hash0 = hash; - } - - return hash0 << 1; -} - -static void str2hashbuf_signed(const char *msg, int len, uint32_t *buf, int num) -{ - uint32_t pad, val; - int i; - const signed char *scp = (const signed char *) msg; - - pad = (uint32_t) len | ((uint32_t) len << 8); - pad |= pad << 16; - - val = pad; - if (len > num * 4) - len = num * 4; - - for (i = 0; i < len; i++) { - if ((i % 4) == 0) - val = pad; - - val = ((int) scp[i]) + (val << 8); - if ((i % 4) == 3) { - *buf++ = val; - val = pad; - num--; - } - } - - if (--num >= 0) - *buf++ = val; - - while (--num >= 0) - *buf++ = pad; -} - -static void str2hashbuf_unsigned(const char *msg, int len, uint32_t *buf, - int num) -{ - uint32_t pad, val; - int i; - const unsigned char *ucp = (const unsigned char *) msg; - - pad = (uint32_t) len | ((uint32_t) len << 8); - pad |= pad << 16; - - val = pad; - if (len > num * 4) - len = num * 4; - - for (i = 0; i < len; i++) { - if ((i % 4) == 0) - val = pad; - - val = ((int) ucp[i]) + (val << 8); - if ((i % 4) == 3) { - *buf++ = val; - val = pad; - num--; - } - } - - if (--num >= 0) - *buf++ = val; - - while (--num >= 0) - *buf++ = pad; -} - -/** Compute hash value of the string. - * - * @param hinfo Hash info structure with information about - * the algorithm, hash seed and with the place - * for the output hash value - * @param len Length of the name - * @param name Name to be hashed - * - * @return Error code - * - */ int ext4_hash_string(ext4_hash_info_t *hinfo, int len, const char *name) { - uint32_t hash = 0; - uint32_t minor_hash = 0; - const char *p; - int i; - uint32_t in[8], buf[4]; - void (*str2hashbuf)(const char *, int, uint32_t *, int) = - str2hashbuf_signed; - - /* Initialize the default seed for the hash checksum functions */ - buf[0] = 0x67452301; - buf[1] = 0xefcdab89; - buf[2] = 0x98badcfe; - buf[3] = 0x10325476; - - /* Check if the seed is all zero's */ - if (hinfo->seed) { - for (i = 0; i < 4; i++) { - if (hinfo->seed[i] != 0) - break; - - } - - if (i < 4) - memcpy(buf, hinfo->seed, sizeof(buf)); - } - - switch (hinfo->hash_version) { - case EXT4_HASH_VERSION_LEGACY_UNSIGNED: - hash = hash_unsigned(name, len); - break; - case EXT4_HASH_VERSION_LEGACY: - hash = hash_signed(name, len); - break; - case EXT4_HASH_VERSION_HALF_MD4_UNSIGNED: - str2hashbuf = str2hashbuf_unsigned; - case EXT4_HASH_VERSION_HALF_MD4: - p = name; - - while (len > 0) { - (*str2hashbuf)(p, len, in, 8); - half_md4_transform(buf, in); - len -= 32; - p += 32; - } - - minor_hash = buf[2]; - hash = buf[1]; - break; - case EXT4_HASH_VERSION_TEA_UNSIGNED: - str2hashbuf = str2hashbuf_unsigned; - case EXT4_HASH_VERSION_TEA: - p = name; - - while (len > 0) { - (*str2hashbuf)(p, len, in, 4); - tea_transform(buf, in); - len -= 16; - p += 16; - } - - hash = buf[0]; - minor_hash = buf[1]; - break; - default: - hinfo->hash = 0; - return EINVAL; - } - - hash = hash & ~1; - if (hash == (EXT4_DIRECTORY_HTREE_EOF << 1)) - hash = (EXT4_DIRECTORY_HTREE_EOF - 1) << 1; - - hinfo->hash = hash; - hinfo->minor_hash = minor_hash; - - return EOK; + // TODO + hinfo->hash = 0; + return ENOTSUP; }