summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2011-06-27 13:45:40 +0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2011-06-27 09:08:52 -0400
commit08fa2aa54e72ddde8076cc77126bace8d4780e0f (patch)
tree5ced9b831123e37b6e91367ed5f56e4acd095a0c /security
parentf91c2c5cfa2950a20265b45bcc13e49ed9e49aac (diff)
downloadlinux-08fa2aa54e72ddde8076cc77126bace8d4780e0f.tar.gz
linux-08fa2aa54e72ddde8076cc77126bace8d4780e0f.tar.bz2
linux-08fa2aa54e72ddde8076cc77126bace8d4780e0f.zip
encrypted-keys: fixed valid_master_desc() function description
Valid key type prefixes for the parameter 'key-type' are: 'trusted' and 'user'. Signed-off-by: Roberto Sassu <roberto.sassu@polito.it> Acked-by: Gianluca Ramunno <ramunno@polito.it> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/keys/encrypted.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/encrypted.c b/security/keys/encrypted.c
index 37cd913f18ae..3ff2f72dad94 100644
--- a/security/keys/encrypted.c
+++ b/security/keys/encrypted.c
@@ -84,7 +84,7 @@ static int aes_get_sizes(void)
/*
* valid_master_desc - verify the 'key-type:desc' of a new/updated master-key
*
- * key-type:= "trusted:" | "encrypted:"
+ * key-type:= "trusted:" | "user:"
* desc:= master-key description
*
* Verify that 'key-type' is valid and that 'desc' exists. On key update,