/* * ecryptfs_format.c: helper functions for the encrypted key type * * Copyright (C) 2006 International Business Machines Corp. * Copyright (C) 2010 Politecnico di Torino, Italy * TORSEC group -- http://security.polito.it * * Authors: * Michael A. Halcrow * Tyler Hicks * Roberto Sassu * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 2 of the License. */ #include #include "ecryptfs_format.h" u8 *ecryptfs_get_auth_tok_key(struct ecryptfs_auth_tok *auth_tok) { return auth_tok->token.password.session_key_encryption_key; } EXPORT_SYMBOL(ecryptfs_get_auth_tok_key); /* * ecryptfs_get_versions() * * Source code taken from the software 'ecryptfs-utils' version 83. * */ void ecryptfs_get_versions(int *major, int *minor, int *file_version) { *major = ECRYPTFS_VERSION_MAJOR; *minor = ECRYPTFS_VERSION_MINOR; if (file_version) *file_version = ECRYPTFS_SUPPORTED_FILE_VERSION; } EXPORT_SYMBOL(ecryptfs_get_versions); /* * ecryptfs_fill_auth_tok - fill the ecryptfs_auth_tok structure * * Fill the ecryptfs_auth_tok structure with required ecryptfs data. * The source code is inspired to the original function generate_payload() * shipped with the software 'ecryptfs-utils' version 83. * */ int ecryptfs_fill_auth_tok(struct ecryptfs_auth_tok *auth_tok, const char *key_desc) { int major, minor; ecryptfs_get_versions(&major, &minor, NULL); auth_tok->version = (((uint16_t)(major << 8) & 0xFF00) | ((uint16_t)minor & 0x00FF)); auth_tok->token_type = ECRYPTFS_PASSWORD; strncpy((char *)auth_tok->token.password.signature, key_desc, ECRYPTFS_PASSWORD_SIG_SIZE); auth_tok->token.password.session_key_encryption_key_bytes = ECRYPTFS_MAX_KEY_BYTES; /* * Removed auth_tok->token.password.salt and * auth_tok->token.password.session_key_encryption_key * initialization from the original code */ /* TODO: Make the hash parameterizable via policy */ auth_tok->token.password.flags |= ECRYPTFS_SESSION_KEY_ENCRYPTION_KEY_SET; /* The kernel code will encrypt the session key. */ auth_tok->session_key.encrypted_key[0] = 0; auth_tok->session_key.encrypted_key_size = 0; /* Default; subject to change by kernel eCryptfs */ auth_tok->token.password.hash_algo = PGP_DIGEST_ALGO_SHA512; auth_tok->token.password.flags &= ~(ECRYPTFS_PERSISTENT_PASSWORD); return 0; } EXPORT_SYMBOL(ecryptfs_fill_auth_tok); MODULE_LICENSE("GPL"); 'submit' value='search'/>
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2017-01-24 15:18:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-24 16:26:14 -0800
commit3705ccfdd1e8b539225ce20e3925a945cc788d67 (patch)
tree99e56310f1dad0b63ac34307f4e2536a675972b6 /include/net/irda/irlap_event.h
parentf598f82e204ec0b17797caaf1b0311c52d43fb9a (diff)
mn10300: fix build error of missing fpu_save()
When CONFIG_FPU is not enabled on arch/mn10300, <asm/switch_to.h> causes a build error with a call to fpu_save(): kernel/built-in.o: In function `.L410': core.c:(.sched.text+0x28a): undefined reference to `fpu_save' Fix this by including <asm/fpu.h> in <asm/switch_to.h> so that an empty static inline fpu_save() is defined. Link: http://lkml.kernel.org/r/dc421c4f-4842-4429-1b99-92865c2f24b6@infradead.org Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: kbuild test robot <fengguang.wu@intel.com> Reviewed-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/net/irda/irlap_event.h')