/* * 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"); ='author'>author
path: root/tools/lib/subcmd/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-24 16:54:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-24 16:54:39 -0800
commit883af14e67e8b8702b5560aa64c888c0cd0bd66c (patch)
tree74e3a6b53f5fad9f7848ab1b9f6921b7012940a4 /tools/lib/subcmd/Makefile
parent0263d4ebd94b36280608e296cba39b924b6e832b (diff)
parentaab45453ff5c77200c6da4ac909f7a4392aed17e (diff)
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "26 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (26 commits) MAINTAINERS: add Dan Streetman to zbud maintainers MAINTAINERS: add Dan Streetman to zswap maintainers mm: do not export ioremap_page_range symbol for external module mn10300: fix build error of missing fpu_save() romfs: use different way to generate fsid for BLOCK or MTD frv: add missing atomic64 operations mm, page_alloc: fix premature OOM when racing with cpuset mems update mm, page_alloc: move cpuset seqcount checking to slowpath mm, page_alloc: fix fast-path race with cpuset update or removal mm, page_alloc: fix check for NULL preferred_zone kernel/panic.c: add missing \n fbdev: color map copying bounds checking frv: add atomic64_add_unless() mm/mempolicy.c: do not put mempolicy before using its nodemask radix-tree: fix private list warnings Documentation/filesystems/proc.txt: add VmPin mm, memcg: do not retry precharge charges proc: add a schedule point in proc_pid_readdir() mm: alloc_contig: re-allow CMA to compact FS pages mm/slub.c: trace free objects at KERN_INFO ...
Diffstat (limited to 'tools/lib/subcmd/Makefile')