History

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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 ...

Linus Torvalds committed 9 years ago

Commit 5a0387a2 parents 204f144 929562b137 files · +13710 −2480Browse files

Showing the changes to include/uapi/linux (1 of 137 files). Show all

Unified · Split

include/uapi/linux/cryptouser.h+5−5
@@ -31,7 +31,7 @@ enum { · 30 unmodified lines
3131 #define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1)
3232 #define CRYPTO_NR_MSGTYPES (CRYPTO_MSG_MAX + 1 - CRYPTO_MSG_BASE)
3333
34−#define CRYPTO_MAX_NAME CRYPTO_MAX_ALG_NAME
34+#define CRYPTO_MAX_NAME 64
3535
3636 /* Netlink message attributes. */
3737 enum crypto_attr_type_t {
@@ -53,9 +53,9 @@ enum crypto_attr_type_t { · 15 unmodified lines
5353 };
5454
5555 struct crypto_user_alg {
56− char cru_name[CRYPTO_MAX_ALG_NAME];
57− char cru_driver_name[CRYPTO_MAX_ALG_NAME];
58− char cru_module_name[CRYPTO_MAX_ALG_NAME];
56+ char cru_name[CRYPTO_MAX_NAME];
57+ char cru_driver_name[CRYPTO_MAX_NAME];
58+ char cru_module_name[CRYPTO_MAX_NAME];
5959 __u32 cru_type;
6060 __u32 cru_mask;
6161 __u32 cru_refcnt;
@@ -73,7 +73,7 @@ struct crypto_report_hash { · 11 unmodified lines
7373 };
7474
7575 struct crypto_report_cipher {
76− char type[CRYPTO_MAX_ALG_NAME];
76+ char type[CRYPTO_MAX_NAME];
7777 unsigned int blocksize;
7878 unsigned int min_keysize;
7979 unsigned int max_keysize;