---

yaml --- r: 232263 b: refs/heads/master c: b970344 h: refs/heads/master i: 232261: 5351097 232259: 467eb6b 232255: 54b51ee v: v3
git-mirror · Jan 23, 2011 · 5ede9bf · 5ede9bf
1 parent 4fa6df1
commit 5ede9bf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b174b6d281f5c87234fc65bafc02877f565c5cf
+refs/heads/master: b9703449347603289cac0bd04e574ac2e777275d
diff --git a/trunk/security/keys/Makefile b/trunk/security/keys/Makefile
@@ -14,7 +14,7 @@ obj-y := \
 	user_defined.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_PROC_FS) += proc.o
 obj-$(CONFIG_SYSCTL) += sysctl.o
diff --git a/trunk/security/keys/encrypted_defined.c → trunk/security/keys/encrypted.c b/trunk/security/keys/encrypted_defined.c → trunk/security/keys/encrypted.c
@@ -30,7 +30,7 @@
 #include <crypto/sha.h>
 #include <crypto/aes.h>
 
-#include "encrypted_defined.h"
+#include "encrypted.h"
 
 static const char KEY_TRUSTED_PREFIX[] = "trusted:";
 static const char KEY_USER_PREFIX[] = "user:";
@@ -888,6 +888,7 @@ static int __init init_encrypted(void)
 out:
 	encrypted_shash_release();
 	return ret;
+
 }
 
 static void __exit cleanup_encrypted(void)

diff --git a/trunk/security/keys/encrypted_defined.h → trunk/security/keys/encrypted.h b/trunk/security/keys/encrypted_defined.h → trunk/security/keys/encrypted.h