reiser4-crypt2cipher-rename.patch]

diff -puN fs/reiser4/init_super.c~reiser4-crypt2cipher-rename fs/reiser4/init_super.c
@@ -640,9 +640,9 @@ static struct {
 		.type = REISER4_ITEM_PLUGIN_TYPE,
 		.id = COMPOUND_DIR_ID
 	},
-	[PSET_CRYPTO] = {
-		.type = REISER4_CRYPTO_PLUGIN_TYPE,
-		.id = NONE_CRYPTO_ID
+	[PSET_CIPHER] = {
+		.type = REISER4_CIPHER_PLUGIN_TYPE,
+		.id = NONE_CIPHER_ID
 	},
 	[PSET_DIGEST] = {
 		.type = REISER4_DIGEST_PLUGIN_TYPE,

diff -puN fs/reiser4/inode.c~reiser4-crypt2cipher-rename fs/reiser4/inode.c
@@ -548,10 +548,10 @@ fibration_plugin *inode_fibration_plugin
 	return reiser4_inode_data(inode)->pset->fibration;
 }
 
-crypto_plugin *inode_crypto_plugin(const struct inode * inode)
+cipher_plugin *inode_cipher_plugin(const struct inode * inode)
 {
 	assert("edward-36", inode != NULL);
-	return reiser4_inode_data(inode)->pset->crypto;
+	return reiser4_inode_data(inode)->pset->cipher;
 }
 
 compression_plugin *inode_compression_plugin(const struct inode * inode)

diff -puN fs/reiser4/inode.h~reiser4-crypt2cipher-rename fs/reiser4/inode.h
@@ -344,7 +344,7 @@ extern perm_plugin *inode_perm_plugin(co
 extern formatting_plugin *inode_formatting_plugin(const struct inode *inode);
 extern hash_plugin *inode_hash_plugin(const struct inode *inode);
 extern fibration_plugin *inode_fibration_plugin(const struct inode *inode);
-extern crypto_plugin *inode_crypto_plugin(const struct inode *inode);
+extern cipher_plugin *inode_cipher_plugin(const struct inode *inode);
 extern digest_plugin *inode_digest_plugin(const struct inode *inode);
 extern compression_plugin *inode_compression_plugin(const struct inode *inode);
 extern compression_mode_plugin *inode_compression_mode_plugin(const struct inode

diff -puN fs/reiser4/plugin/crypto/cipher.c~reiser4-crypt2cipher-rename fs/reiser4/plugin/crypto/cipher.c
@@ -8,10 +8,11 @@
 #include <linux/types.h>
 #include <linux/random.h>
 
-#define MAX_CRYPTO_BLOCKSIZE 128
+#define MIN_CIPHER_BLOCKSIZE 8
+#define MAX_CIPHER_BLOCKSIZE 128
 
 /*
-  Default align() method of the crypto-plugin (look for description of this
+  Default align() method of the cipher plugin (look for description of this
   method in plugin/plugin.h)
 
   1) creates the aligning armored format of the input flow before encryption.

@@ -26,14 +27,14 @@
 */
 static int align_stream_common(__u8 * pad,
 			       int flow_size /* size of non-aligned flow */,
-			       int blocksize /* crypto-block size */)
+			       int blocksize /* cipher block size */)
 {
 	int pad_size;
 
 	assert("edward-01", pad != NULL);
 	assert("edward-02", flow_size != 0);
 	assert("edward-03", blocksize != 0
-	       || blocksize <= MAX_CRYPTO_BLOCKSIZE);
+	       || blocksize <= MAX_CIPHER_BLOCKSIZE);
 
 	pad_size = blocksize - (flow_size % blocksize);
 	get_random_bytes(pad, pad_size);

@@ -66,11 +67,11 @@ static struct crypto_tfm * alloc_aes (vo
 #endif /* REISER4_AES */
 }
 
-crypto_plugin crypto_plugins[LAST_CRYPTO_ID] = {
-	[NONE_CRYPTO_ID] = {
+cipher_plugin cipher_plugins[LAST_CIPHER_ID] = {
+	[NONE_CIPHER_ID] = {
 		.h = {
-			.type_id = REISER4_CRYPTO_PLUGIN_TYPE,
-			.id = NONE_CRYPTO_ID,
+			.type_id = REISER4_CIPHER_PLUGIN_TYPE,
+			.id = NONE_CIPHER_ID,
 			.pops = NULL,
 			.label = "none",
 			.desc = "no cipher transform",

@@ -84,10 +85,10 @@ crypto_plugin crypto_plugins[LAST_CRYPTO
 		.encrypt = NULL,
 		.decrypt = NULL
 	},
-	[AES_CRYPTO_ID] = {
+	[AES_CIPHER_ID] = {
 		.h = {
-			.type_id = REISER4_CRYPTO_PLUGIN_TYPE,
-			.id = AES_CRYPTO_ID,
+			.type_id = REISER4_CIPHER_PLUGIN_TYPE,
+			.id = AES_CIPHER_ID,
 			.pops = NULL,
 			.label = "aes",
 			.desc = "aes cipher transform",

209 lines not on this page · raw message

diff -puN fs/reiser4/plugin/file/cryptcompress.h~reiser4-crypt2cipher-rename fs/reiser4/plugin/file/cryptcompress.h
@@ -15,7 +15,6 @@
 #define MAX_CLUSTER_SHIFT 16
 #define MAX_CLUSTER_NRPAGES (1U << MAX_CLUSTER_SHIFT >> PAGE_CACHE_SHIFT)
 #define DC_CHECKSUM_SIZE 4
-#define MIN_CRYPTO_BLOCKSIZE 8
 
 #if REISER4_DEBUG
 static inline int cluster_shift_ok(int shift)

@@ -472,10 +471,10 @@ info_digest_tfm (crypto_stat_t * info)
 	return info_get_tfm(info, DIGEST_TFM);
 }
 
-static inline crypto_plugin *
+static inline cipher_plugin *
 info_cipher_plugin (crypto_stat_t * info)
 {
-	return &info_get_tfma(info, CIPHER_TFM)->plug->crypto;
+	return &info_get_tfma(info, CIPHER_TFM)->plug->cipher;
 }
 
 static inline digest_plugin *

@@ -491,9 +490,9 @@ info_set_plugin(crypto_stat_t * info, re
 }
 
 static inline void
-info_set_crypto_plugin(crypto_stat_t * info, crypto_plugin * cplug)
+info_set_cipher_plugin(crypto_stat_t * info, cipher_plugin * cplug)
 {
-	info_set_plugin(info, CIPHER_TFM, crypto_plugin_to_plugin(cplug));
+	info_set_plugin(info, CIPHER_TFM, cipher_plugin_to_plugin(cplug));
 }
 
 static inline void

diff -puN fs/reiser4/plugin/file/file.c~reiser4-crypt2cipher-rename fs/reiser4/plugin/file/file.c
@@ -638,7 +638,6 @@ static int shorten_file(struct inode *in
 		return 0;
 	}
 
-	/* FIXME: not sure how crypto files will work here. Probably they will not. */
 	result = find_file_state(unix_file_inode_data(inode));
 	if (result)
 		return result;

diff -puN fs/reiser4/plugin/file_plugin_common.c~reiser4-crypt2cipher-rename fs/reiser4/plugin/file_plugin_common.c
@@ -155,7 +155,7 @@ int adjust_to_parent_cryptcompress(struc
  	assert("edward-1416", parent != NULL);
 
  	grab_plugin(object, parent, PSET_CLUSTER);
- 	grab_plugin(object, parent, PSET_CRYPTO);
+ 	grab_plugin(object, parent, PSET_CIPHER);
  	grab_plugin(object, parent, PSET_DIGEST);
  	grab_plugin(object, parent, PSET_COMPRESSION);
  	grab_plugin(object, parent, PSET_COMPRESSION_MODE);

diff -puN fs/reiser4/plugin/plugin.c~reiser4-crypt2cipher-rename fs/reiser4/plugin/plugin.c
@@ -467,14 +467,14 @@ reiser4_plugin_type_data plugins[REISER4
 		.plugins_list =	{NULL, NULL},
 		.size = sizeof(fibration_plugin)
 	},
-	[REISER4_CRYPTO_PLUGIN_TYPE] = {
-		.type_id = REISER4_CRYPTO_PLUGIN_TYPE,
-		.label = "crypto",
-		.desc = "Crypto plugins",
-		.builtin_num = sizeof_array(crypto_plugins),
-		.builtin = crypto_plugins,
+	[REISER4_CIPHER_PLUGIN_TYPE] = {
+		.type_id = REISER4_CIPHER_PLUGIN_TYPE,
+		.label = "cipher",
+		.desc = "Cipher plugins",
+		.builtin_num = sizeof_array(cipher_plugins),
+		.builtin = cipher_plugins,
 		.plugins_list =	{NULL, NULL},
-		.size = sizeof(crypto_plugin)
+		.size = sizeof(cipher_plugin)
 	},
 	[REISER4_DIGEST_PLUGIN_TYPE] = {
 		.type_id = REISER4_DIGEST_PLUGIN_TYPE,

112 lines not on this page · raw message

diff -puN fs/reiser4/plugin/plugin_header.h~reiser4-crypt2cipher-rename fs/reiser4/plugin/plugin_header.h
@@ -22,7 +22,7 @@ typedef enum {
 	REISER4_SD_EXT_PLUGIN_TYPE,
 	REISER4_FORMAT_PLUGIN_TYPE,
 	REISER4_JNODE_PLUGIN_TYPE,
-	REISER4_CRYPTO_PLUGIN_TYPE,
+	REISER4_CIPHER_PLUGIN_TYPE,
 	REISER4_DIGEST_PLUGIN_TYPE,
 	REISER4_COMPRESSION_PLUGIN_TYPE,
 	REISER4_COMPRESSION_MODE_PLUGIN_TYPE,

diff -puN fs/reiser4/plugin/plugin_set.c~reiser4-crypt2cipher-rename fs/reiser4/plugin/plugin_set.c
@@ -61,7 +61,7 @@ static inline int pseq(const unsigned lo
 		sizeof set1->fibration +
 		sizeof set1->sd +
 		sizeof set1->dir_item +
-		sizeof set1->crypto +
+		sizeof set1->cipher +
 		sizeof set1->digest +
 		sizeof set1->compression +
 		sizeof set1->compression_mode +

@@ -79,7 +79,7 @@ static inline int pseq(const unsigned lo
 	    set1->fibration == set2->fibration &&
 	    set1->sd == set2->sd &&
 	    set1->dir_item == set2->dir_item &&
-	    set1->crypto == set2->crypto &&
+	    set1->cipher == set2->cipher &&
 	    set1->digest == set2->digest &&
 	    set1->compression == set2->compression &&
 	    set1->compression_mode == set2->compression_mode &&

@@ -105,7 +105,7 @@ static inline unsigned long calculate_ha
 	HASH_FIELD(result, set, fibration);
 	HASH_FIELD(result, set, sd);
 	HASH_FIELD(result, set, dir_item);
-	HASH_FIELD(result, set, crypto);
+	HASH_FIELD(result, set, cipher);
 	HASH_FIELD(result, set, digest);
 	HASH_FIELD(result, set, compression);
 	HASH_FIELD(result, set, compression_mode);

@@ -139,7 +139,7 @@ static plugin_set empty_set = {
 	.fibration = NULL,
 	.sd = NULL,
 	.dir_item = NULL,
-	.crypto = NULL,
+	.cipher = NULL,
 	.digest = NULL,
 	.compression = NULL,
 	.compression_mode = NULL,

@@ -244,9 +244,9 @@ static struct {
 		.offset = offsetof(plugin_set, dir_item),
 		.type = REISER4_ITEM_PLUGIN_TYPE
 	},
-	[PSET_CRYPTO] = {
-		.offset = offsetof(plugin_set, crypto),
-		.type = REISER4_CRYPTO_PLUGIN_TYPE
+	[PSET_CIPHER] = {
+		.offset = offsetof(plugin_set, cipher),
+		.type = REISER4_CIPHER_PLUGIN_TYPE
 	},
 	[PSET_DIGEST] = {
 		.offset = offsetof(plugin_set, digest),

@@ -320,7 +320,7 @@ DEFINE_PLUGIN_SET(file_plugin, file)
     DEFINE_PLUGIN_SET(hash_plugin, hash)
     DEFINE_PLUGIN_SET(fibration_plugin, fibration)
     DEFINE_PLUGIN_SET(item_plugin, sd)
-    DEFINE_PLUGIN_SET(crypto_plugin, crypto)
+    DEFINE_PLUGIN_SET(cipher_plugin, cipher)
     DEFINE_PLUGIN_SET(digest_plugin, digest)
     DEFINE_PLUGIN_SET(compression_plugin, compression)
     DEFINE_PLUGIN_SET(compression_mode_plugin, compression_mode)

diff -puN fs/reiser4/plugin/plugin_set.h~reiser4-crypt2cipher-rename fs/reiser4/plugin/plugin_set.h
@@ -33,8 +33,8 @@ struct plugin_set {
 	item_plugin *sd;
 	/* plugin of items a directory is built of */
 	item_plugin *dir_item;
-	/* crypto plugin */
-	crypto_plugin *crypto;
+	/* cipher plugin */
+	cipher_plugin *cipher;
 	/* digest plugin */
 	digest_plugin *digest;
 	/* compression plugin */

@@ -57,7 +57,7 @@ extern int plugin_set_formatting(plugin_
 extern int plugin_set_hash(plugin_set ** set, hash_plugin * plug);
 extern int plugin_set_fibration(plugin_set ** set, fibration_plugin * plug);
 extern int plugin_set_sd(plugin_set ** set, item_plugin * plug);
-extern int plugin_set_crypto(plugin_set ** set, crypto_plugin * plug);
+extern int plugin_set_cipher(plugin_set ** set, cipher_plugin * plug);
 extern int plugin_set_digest(plugin_set ** set, digest_plugin * plug);
 extern int plugin_set_compression(plugin_set ** set, compression_plugin * plug);
 extern int plugin_set_compression_mode(plugin_set ** set,