Pull crypto updates from Herbert Xu: "Here is the crypto update for 4.12: API: - Add batch registration for acomp/scomp - Change acomp testing to non-unique compressed result - Extend algorithm name limit to 128 bytes - Require setkey before accept(2) in algif_aead Algorithms: - Add support for deflate rfc1950 (zlib) Drivers: - Add accelerated crct10dif for powerpc - Add crc32 in stm32 - Add sha384/sha512 in ccp - Add 3des/gcm(aes) for v5 devices in ccp - Add Queue Interface (QI) backend support in caam - Add new Exynos RNG driver - Add ThunderX ZIP driver - Add driver for hardware random generator on MT7623 SoC" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (101 commits) crypto: stm32 - Fix OF module alias information crypto: algif_aead - Require setkey before accept(2) crypto: scomp - add support for deflate rfc1950 (zlib) crypto: scomp - allow registration of multiple scomps crypto: ccp - Change ISR handler method for a v5 CCP crypto: ccp - Change ISR handler method for a v3 CCP crypto: crypto4xx - rename ce_ring_contol to ce_ring_control crypto: testmgr - Allow ecb(cipher_null) in FIPS mode Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT" crypto: ccp - Disable interrupts early on unload crypto: ccp - Use only the relevant interrupt bits hwrng: mtk - Add driver for hardware random generator on MT7623 SoC dt-bindings: hwrng: Add Mediatek hardware random generator bindings crypto: crct10dif-vpmsum - Fix missing preempt_disable() crypto: testmgr - replace compression known answer test crypto: acomp - allow registration of multiple acomps hwrng: n2 - Use devm_kcalloc() in n2rng_probe() crypto: chcr - Fix error handling related to 'chcr_alloc_shash' padata: get_next is never NULL crypto: exynos - Add new Exynos RNG driver ...
Showing the changes to include/uapi/linux (1 of 137 files). Show all
Unified · Split
| @@ -31,7 +31,7 @@ enum { · 30 unmodified lines | |||
| 31 | #define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1) | 31 | #define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1) |
| 32 | #define CRYPTO_NR_MSGTYPES (CRYPTO_MSG_MAX + 1 - CRYPTO_MSG_BASE) | 32 | #define CRYPTO_NR_MSGTYPES (CRYPTO_MSG_MAX + 1 - CRYPTO_MSG_BASE) |
| 33 | 33 | ||
| 34 | #define CRYPTO_MAX_NAME CRYPTO_MAX_ALG_NAME | 34 | #define CRYPTO_MAX_NAME 64 |
| 35 | 35 | ||
| 36 | /* Netlink message attributes. */ | 36 | /* Netlink message attributes. */ |
| 37 | enum crypto_attr_type_t { | 37 | enum crypto_attr_type_t { |
| @@ -53,9 +53,9 @@ enum crypto_attr_type_t { · 15 unmodified lines | |||
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | struct crypto_user_alg { | 55 | struct crypto_user_alg { |
| 56 | char cru_name[CRYPTO_MAX_ALG_NAME]; | 56 | char cru_name[CRYPTO_MAX_NAME]; |
| 57 | char cru_driver_name[CRYPTO_MAX_ALG_NAME]; | 57 | char cru_driver_name[CRYPTO_MAX_NAME]; |
| 58 | char cru_module_name[CRYPTO_MAX_ALG_NAME]; | 58 | char cru_module_name[CRYPTO_MAX_NAME]; |
| 59 | __u32 cru_type; | 59 | __u32 cru_type; |
| 60 | __u32 cru_mask; | 60 | __u32 cru_mask; |
| 61 | __u32 cru_refcnt; | 61 | __u32 cru_refcnt; |
| @@ -73,7 +73,7 @@ struct crypto_report_hash { · 11 unmodified lines | |||
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | struct crypto_report_cipher { | 75 | struct crypto_report_cipher { |
| 76 | char type[CRYPTO_MAX_ALG_NAME]; | 76 | char type[CRYPTO_MAX_NAME]; |
| 77 | unsigned int blocksize; | 77 | unsigned int blocksize; |
| 78 | unsigned int min_keysize; | 78 | unsigned int min_keysize; |
| 79 | unsigned int max_keysize; | 79 | unsigned int max_keysize; |