Index: uspace/lib/crypto/Makefile =================================================================== --- uspace/lib/crypto/Makefile (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ uspace/lib/crypto/Makefile (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) @@ -33,5 +33,6 @@ crypto.c \ aes.c \ - rc4.c + rc4.c \ + crc16_ibm.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/crypto/crc16_ibm.c =================================================================== --- uspace/lib/crypto/crc16_ibm.c (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) +++ uspace/lib/crypto/crc16_ibm.c (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) @@ -0,0 +1,59 @@ +#include +#include +#include "crypto.h" + +/* CRC16-IBM implementation */ +/* POLYNOMIAL = 0xA001 */ + +static uint16_t crct[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}; + +/* Compute a CRC16 + * + * @param crc Init value of the CRC + * @param buf Pointer to the data + * @param len Size of the buffer + * + * @return Value of the CRC. + */ +uint16_t crc16_ibm(uint16_t crc, uint8_t *buf, size_t len) +{ + while (len--) { + crc ^= *buf++; + crc = (crc >> 8) ^ crct[crc & 0x00FF]; + } + + return crc; +} + Index: uspace/lib/crypto/crypto.h =================================================================== --- uspace/lib/crypto/crypto.h (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ uspace/lib/crypto/crypto.h (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) @@ -56,3 +56,5 @@ extern int pbkdf2(uint8_t *, size_t, uint8_t *, size_t, uint8_t *); +extern uint16_t crc16_ibm(uint16_t crc, uint8_t *buf, size_t len); + #endif Index: uspace/lib/ext4/Makefile =================================================================== --- uspace/lib/ext4/Makefile (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ uspace/lib/ext4/Makefile (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) @@ -29,6 +29,6 @@ USPACE_PREFIX = ../.. LIBRARY = libext4 -EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -LIBS = $(LIBBLOCK_PREFIX)/libblock.a +EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX) +LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCRYPTO_PREFIX)/libcrypto.a SOURCES = \ @@ -36,5 +36,4 @@ libext4_bitmap.c \ libext4_block_group.c \ - libext4_crc.c \ libext4_directory.c \ libext4_directory_index.c \ Index: uspace/lib/ext4/libext4.h =================================================================== --- uspace/lib/ext4/libext4.h (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ uspace/lib/ext4/libext4.h (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) @@ -37,5 +37,4 @@ #include "libext4_bitmap.h" #include "libext4_block_group.h" -#include "libext4_crc.h" #include "libext4_directory.h" #include "libext4_directory_index.h" Index: uspace/lib/ext4/libext4_crc.c =================================================================== --- uspace/lib/ext4/libext4_crc.c (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2012 Frantisek Princ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libext4 - * @{ - */ - -/** - * @file libext4_crc.c - */ - -#include "libext4.h" - -uint16_t crc16(uint16_t crc, const uint8_t *buffer, size_t len) -{ - /* TODO */ - return 0; -} - -/** - * @} - */ Index: uspace/lib/ext4/libext4_crc.h =================================================================== --- uspace/lib/ext4/libext4_crc.h (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ (revision ) @@ -1,42 +1,0 @@ -/* - * Copyright (c) 2012 Frantisek Princ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libext4 - * @{ - */ - -#ifndef LIBEXT4_LIBEXT4_CRC_H_ -#define LIBEXT4_LIBEXT4_CRC_H_ - -extern uint16_t crc16(uint16_t, const uint8_t *, size_t); - -#endif - -/** - * @} - */ Index: uspace/lib/ext4/libext4_filesystem.c =================================================================== --- uspace/lib/ext4/libext4_filesystem.c (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ uspace/lib/ext4/libext4_filesystem.c (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) @@ -41,4 +41,5 @@ #include #include +#include #include "libext4.h" @@ -54,4 +55,5 @@ enum cache_mode cmode) { + int rc; ext4_superblock_t *temp_superblock = NULL; @@ -59,5 +61,5 @@ /* Initialize block library (4096 is size of communication channel) */ - int rc = block_init(EXCHANGE_SERIALIZE, fs->device, 4096); + rc = block_init(EXCHANGE_SERIALIZE, fs->device, 4096); if (rc != EOK) goto err; @@ -140,5 +142,5 @@ /* Release memory space for superblock */ free(fs->superblock); - + /* Finish work with block library */ block_cache_fini(fs->device); @@ -532,5 +534,5 @@ /* If checksum not supported, 0 will be returned */ uint16_t crc = 0; - + /* Compute the checksum only if the filesystem supports it */ if (ext4_superblock_has_feature_read_only(sb, @@ -545,11 +547,11 @@ /* Initialization */ - crc = crc16(~0, sb->uuid, sizeof(sb->uuid)); + crc = crc16_ibm(~0, sb->uuid, sizeof(sb->uuid)); /* Include index of block group */ - crc = crc16(crc, (uint8_t *) &le_group, sizeof(le_group)); + crc = crc16_ibm(crc, (uint8_t *) &le_group, sizeof(le_group)); /* Compute crc from the first part (stop before checksum field) */ - crc = crc16(crc, (uint8_t *) bg, offset); + crc = crc16_ibm(crc, (uint8_t *) bg, offset); /* Skip checksum */ @@ -560,5 +562,5 @@ EXT4_FEATURE_INCOMPAT_64BIT)) && (offset < ext4_superblock_get_desc_size(sb))) - crc = crc16(crc, ((uint8_t *) bg) + offset, + crc = crc16_ibm(crc, ((uint8_t *) bg) + offset, ext4_superblock_get_desc_size(sb) - offset); } Index: uspace/srv/fs/ext4fs/Makefile =================================================================== --- uspace/srv/fs/ext4fs/Makefile (revision bf1733d347ebc9b897d0138cbe49a119c233033a) +++ uspace/srv/fs/ext4fs/Makefile (revision 2b5d9668b59972cbe16189c39d66821f9d605af4) @@ -28,6 +28,7 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBEXT4_PREFIX)/libext4.a -EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX) +LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a \ + $(LIBEXT4_PREFIX)/libext4.a $(LIBCRYPTO_PREFIX)/libcrypto.a +EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX) -I$(LIBCRYPTO_PREFIX) BINARY = ext4fs STATIC_NEEDED = y