diff options
author | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2009-08-21 05:27:46 -0400 |
---|---|---|
committer | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2009-09-23 10:10:32 -0400 |
commit | df6ad33ba1b9846bd5f0e2b9016c30c20bc2d948 (patch) | |
tree | 5bed7a289830867f2bac4dc05f076b7121e41ae3 /fs/ecryptfs/crypto.c | |
parent | ac22ba23b659e34a5961aec8c945608e471b0d5b (diff) |
eCryptfs: Filename encryption only supports password auth tokens
Returns -ENOTSUPP when attempting to use filename encryption with
something other than a password authentication token, such as a private
token from openssl. Using filename encryption with a userspace eCryptfs
key module is a future goal. Until then, this patch handles the
situation a little better than simply using a BUG_ON().
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: ecryptfs-devel@lists.launchpad.net
Cc: stable <stable@kernel.org>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs/crypto.c')
-rw-r--r-- | fs/ecryptfs/crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index f92370aa5704..bae20ad1a504 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c | |||
@@ -1703,7 +1703,7 @@ ecryptfs_encrypt_filename(struct ecryptfs_filename *filename, | |||
1703 | } else { | 1703 | } else { |
1704 | printk(KERN_ERR "%s: No support for requested filename " | 1704 | printk(KERN_ERR "%s: No support for requested filename " |
1705 | "encryption method in this release\n", __func__); | 1705 | "encryption method in this release\n", __func__); |
1706 | rc = -ENOTSUPP; | 1706 | rc = -EOPNOTSUPP; |
1707 | goto out; | 1707 | goto out; |
1708 | } | 1708 | } |
1709 | out: | 1709 | out: |
@@ -2168,7 +2168,7 @@ int ecryptfs_encrypt_and_encode_filename( | |||
2168 | (*encoded_name)[(*encoded_name_size)] = '\0'; | 2168 | (*encoded_name)[(*encoded_name_size)] = '\0'; |
2169 | (*encoded_name_size)++; | 2169 | (*encoded_name_size)++; |
2170 | } else { | 2170 | } else { |
2171 | rc = -ENOTSUPP; | 2171 | rc = -EOPNOTSUPP; |
2172 | } | 2172 | } |
2173 | if (rc) { | 2173 | if (rc) { |
2174 | printk(KERN_ERR "%s: Error attempting to encode " | 2174 | printk(KERN_ERR "%s: Error attempting to encode " |