Browse Source

encrypted-keys: rename encrypted_defined files to encrypted

Rename encrypted_defined.c and encrypted_defined.h files to encrypted.c and
encrypted.h, respectively. Based on request from David Howells.

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Mimi Zohar 14 years ago
parent
commit
b970344934
3 changed files with 3 additions and 2 deletions
  1. 1 1
      security/keys/Makefile
  2. 2 1
      security/keys/encrypted.c
  3. 0 0
      security/keys/encrypted.h

+ 1 - 1
security/keys/Makefile

@@ -14,7 +14,7 @@ obj-y := \
 	user_defined.o
 	user_defined.o
 
 
 obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
 obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
-obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted_defined.o
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o
 obj-$(CONFIG_KEYS_COMPAT) += compat.o
 obj-$(CONFIG_KEYS_COMPAT) += compat.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_SYSCTL) += sysctl.o
 obj-$(CONFIG_SYSCTL) += sysctl.o

+ 2 - 1
security/keys/encrypted_defined.c → security/keys/encrypted.c

@@ -30,7 +30,7 @@
 #include <crypto/sha.h>
 #include <crypto/sha.h>
 #include <crypto/aes.h>
 #include <crypto/aes.h>
 
 
-#include "encrypted_defined.h"
+#include "encrypted.h"
 
 
 static const char KEY_TRUSTED_PREFIX[] = "trusted:";
 static const char KEY_TRUSTED_PREFIX[] = "trusted:";
 static const char KEY_USER_PREFIX[] = "user:";
 static const char KEY_USER_PREFIX[] = "user:";
@@ -888,6 +888,7 @@ static int __init init_encrypted(void)
 out:
 out:
 	encrypted_shash_release();
 	encrypted_shash_release();
 	return ret;
 	return ret;
+
 }
 }
 
 
 static void __exit cleanup_encrypted(void)
 static void __exit cleanup_encrypted(void)

+ 0 - 0
security/keys/encrypted_defined.h → security/keys/encrypted.h