Changeset 2b5d966 in mainline

Timestamp:

2015-04-30T21:44:54Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

df2bce3

Parents:

bf1733d3

Message:

libext4, crypto: add the CRC16-IBM implementation to the crypto library.

Location:

uspace

Files:

• lib/crypto/Makefile (modified) (1 diff)
• lib/crypto/crc16_ibm.c (added)
• lib/crypto/crypto.h (modified) (1 diff)
• lib/ext4/Makefile (modified) (2 diffs)
• lib/ext4/libext4.h (modified) (1 diff)
• lib/ext4/libext4_crc.c (deleted)
• lib/ext4/libext4_crc.h (deleted)
• lib/ext4/libext4_filesystem.c (modified) (7 diffs)
• srv/fs/ext4fs/Makefile (modified) (1 diff)

uspace/lib/crypto/Makefile

@@ -33 +33 @@
         crypto.c \
         aes.c \
-        rc4.c
+        rc4.c \
+        crc16_ibm.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/crypto/crypto.h

@@ -56 +56 @@
 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

uspace/lib/ext4/Makefile

@@ -29 +29 @@
 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 +36 @@
         libext4_bitmap.c \
         libext4_block_group.c \
-        libext4_crc.c \
         libext4_directory.c \
         libext4_directory_index.c \

uspace/lib/ext4/libext4.h

@@ -37 +37 @@
 #include "libext4_bitmap.h"
 #include "libext4_block_group.h"
-#include "libext4_crc.h"
 #include "libext4_directory.h"
 #include "libext4_directory_index.h"

uspace/lib/ext4/libext4_filesystem.c

@@ -41 +41 @@
 #include <ipc/vfs.h>
 #include <align.h>
+#include <crypto.h>
 #include "libext4.h"
 
@@ -54 +55 @@
     enum cache_mode cmode)
 {
+        int rc;
         ext4_superblock_t *temp_superblock = NULL;
 
@@ -59 +61 @@
 
         /* 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 +142 @@
         /* Release memory space for superblock */
         free(fs->superblock);
-        
+
         /* Finish work with block library */
         block_cache_fini(fs->device);
@@ -532 +534 @@
         /* 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 +547 @@
                 
                 /* 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 +562 @@
                     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);
         }

uspace/srv/fs/ext4fs/Makefile

@@ -28 +28 @@
 
 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