# 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/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux-gcc --version # < git log --format=%s --max-count=1 baa888d25ea64d0c59344d474284ca99cfdd449a # < make -s -j 10 ARCH=parisc O=/kisskb/build/linus_a500_defconfig_parisc64 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux- a500_defconfig # make -s -j 10 ARCH=parisc O=/kisskb/build/linus_a500_defconfig_parisc64 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux- :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] In file included from /kisskb/src/arch/parisc/include/asm/atomic.h:10, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/arch/parisc/include/asm/bitops.h:13, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/scsi/scsi_debug.c:23: /kisskb/src/drivers/scsi/scsi_debug.c: In function 'resp_start_stop': /kisskb/src/arch/parisc/include/asm/cmpxchg.h:48:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) /kisskb/src/arch/parisc/include/asm/atomic.h:78:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^~~~ /kisskb/src/drivers/scsi/scsi_debug.c:1624:2: note: in expansion of macro 'atomic_xchg' atomic_xchg(&devip->stopped, stop); ^~~~~~~~~~~ /kisskb/src/scripts/unifdef.c: In function 'Mpass': /kisskb/src/scripts/unifdef.c:453:28: warning: 'strncpy' output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation] static void Mpass (void) { strncpy(keyword, "if ", 4); Pelif(); } ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ./usr/include/linux/v4l2-controls.h:1105: found __[us]{8,16,32,64} type without #include Completed OK # rm -rf /kisskb/build/linus_a500_defconfig_parisc64 # Build took: 0:01:33.883550