# git rev-parse -q --verify baa888d25ea64d0c59344d474284ca99cfdd449a^{commit} baa888d25ea64d0c59344d474284ca99cfdd449a already have revision, skipping fetch # git checkout -q -f -B kisskb baa888d25ea64d0c59344d474284ca99cfdd449a # git clean -qxdf # < git log -1 # commit baa888d25ea64d0c59344d474284ca99cfdd449a # Merge: 7260935d71b6 64ae16dfeefe # Author: Linus Torvalds # Date: Thu Nov 1 15:23:59 2018 -0700 # # Merge branch 'next-keys2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security # # Pull keys updates from James Morris: # "Provide five new operations in the key_type struct that can be used to # provide access to asymmetric key operations. These will be implemented # for the asymmetric key type in a later patch and may refer to a key # retained in RAM by the kernel or a key retained in crypto hardware. # # int (*asym_query)(const struct kernel_pkey_params *params, # struct kernel_pkey_query *info); # int (*asym_eds_op)(struct kernel_pkey_params *params, # const void *in, void *out); # int (*asym_verify_signature)(struct kernel_pkey_params *params, # const void *in, const void *in2); # # Since encrypt, decrypt and sign are identical in their interfaces, # they're rolled together in the asym_eds_op() operation and there's an # operation ID in the params argument to distinguish them. # # Verify is different in that we supply the data and the signature # instead and get an error value (or 0) as the only result on the # expectation that this may well be how a hardware crypto device may # work" # # * 'next-keys2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (22 commits) # KEYS: asym_tpm: Add support for the sign operation [ver #2] # KEYS: asym_tpm: Implement tpm_sign [ver #2] # KEYS: asym_tpm: Implement signature verification [ver #2] # KEYS: asym_tpm: Implement the decrypt operation [ver #2] # KEYS: asym_tpm: Implement tpm_unbind [ver #2] # KEYS: asym_tpm: Add loadkey2 and flushspecific [ver #2] # KEYS: Move trusted.h to include/keys [ver #2] # KEYS: trusted: Expose common functionality [ver #2] # KEYS: asym_tpm: Implement encryption operation [ver #2] # KEYS: asym_tpm: Implement pkey_query [ver #2] # KEYS: Add parser for TPM-based keys [ver #2] # KEYS: asym_tpm: extract key size & public key [ver #2] # KEYS: asym_tpm: add skeleton for asym_tpm [ver #2] # crypto: rsa-pkcs1pad: Allow hash to be optional [ver #2] # KEYS: Implement PKCS#8 RSA Private Key parser [ver #2] # KEYS: Implement encrypt, decrypt and sign for software asymmetric key [ver #2] # KEYS: Allow the public_key struct to hold a private key [ver #2] # KEYS: Provide software public key query function [ver #2] # KEYS: Make the X.509 and PKCS7 parsers supply the sig encoding type [ver #2] # KEYS: Provide missing asymmetric key subops for new key type ops [ver #2] # ... # < /opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < git log --format=%s --max-count=1 baa888d25ea64d0c59344d474284ca99cfdd449a # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # make -s -j 10 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1317:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp] :1320:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp] :1323:2: warning: #warning syscall pkey_free not implemented [-Wcpp] :1326:2: warning: #warning syscall statx not implemented [-Wcpp] :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:389: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:392: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:341:21: note: 'pdeo' was declared here /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:186:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:2: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:2: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:2: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4 # Build took: 0:00:23.145377