diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-29 12:11:16 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-02 13:00:26 +0200 |
| commit | 2faceb1a395fcd61107b2154638b35d15172ef06 (patch) | |
| tree | 8038a7a6bd97cbb27048383b04a056f66b76d4c9 /target | |
| parent | e0505cc0182acf569cdd7b849189c134684160f8 (diff) | |
| download | upstream-2faceb1a395fcd61107b2154638b35d15172ef06.tar.gz upstream-2faceb1a395fcd61107b2154638b35d15172ef06.tar.bz2 upstream-2faceb1a395fcd61107b2154638b35d15172ef06.zip | |
kernel: bump 4.9 to 4.9.171
Refreshed all patches.
Altered patches:
- 150-bridge_allow_receiption_on_disabled_port.patch
- 201-extra_optimization.patch
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target')
7 files changed, 177 insertions, 175 deletions
diff --git a/target/linux/generic/hack-4.9/207-disable-modorder.patch b/target/linux/generic/hack-4.9/207-disable-modorder.patch index c66a4db200..e92f4fa0bf 100644 --- a/target/linux/generic/hack-4.9/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.9/207-disable-modorder.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/Makefile +++ b/Makefile -@@ -1227,7 +1227,6 @@ all: modules +@@ -1226,7 +1226,6 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild -@@ -1257,7 +1256,6 @@ _modinst_: +@@ -1256,7 +1255,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi diff --git a/target/linux/generic/hack-4.9/220-gc_sections.patch b/target/linux/generic/hack-4.9/220-gc_sections.patch index ea6ce0bcf7..732e38aaf0 100644 --- a/target/linux/generic/hack-4.9/220-gc_sections.patch +++ b/target/linux/generic/hack-4.9/220-gc_sections.patch @@ -43,8 +43,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> -endif - ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE - KBUILD_CFLAGS += $(call cc-option,-Oz,-Os) - KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) + KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) + else --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -81,6 +81,7 @@ config ARM diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch index 7c4a48f5ff..ee72d984f9 100644 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch @@ -244,7 +244,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -1798,10 +1798,12 @@ static int __init setup_vmstat(void) +@@ -1793,10 +1793,12 @@ static int __init setup_vmstat(void) cpu_notifier_register_done(); #endif #ifdef CONFIG_PROC_FS diff --git a/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch index a164f6e7ea..c62eea3124 100644 --- a/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch @@ -15,17 +15,19 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -233,7 +233,8 @@ static int br_handle_local_finish(struct +@@ -231,7 +231,10 @@ static void __br_handle_local_finish(str + /* note: already called with rcu_read_lock */ + static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { - struct net_bridge_port *p = br_port_get_rcu(skb->dev); - - __br_handle_local_finish(skb); ++ struct net_bridge_port *p = br_port_get_rcu(skb->dev); ++ + if (p->state != BR_STATE_DISABLED) + __br_handle_local_finish(skb); - BR_INPUT_SKB_CB(skb)->brdev = p->br->dev; - br_pass_frame_up(skb); -@@ -316,6 +317,15 @@ rx_handler_result_t br_handle_frame(stru + /* return 1 to signal the okfn() was called so it's ok to use the skb */ + return 1; +@@ -321,6 +324,15 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { diff --git a/target/linux/generic/pending-4.9/201-extra_optimization.patch b/target/linux/generic/pending-4.9/201-extra_optimization.patch index 7b6397919e..3d0fc822bb 100644 --- a/target/linux/generic/pending-4.9/201-extra_optimization.patch +++ b/target/linux/generic/pending-4.9/201-extra_optimization.patch @@ -14,12 +14,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/Makefile +++ b/Makefile -@@ -656,12 +656,12 @@ endif +@@ -655,12 +655,12 @@ KBUILD_CFLAGS += $(call cc-option,-fdata + endif ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE - KBUILD_CFLAGS += $(call cc-option,-Oz,-Os) --KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) -+KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) +-KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) ++KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) else ifdef CONFIG_PROFILE_ALL_BRANCHES -KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) diff --git a/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch b/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch index 378b7a5135..9ba915a5f3 100644 --- a/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch @@ -4735,7 +4735,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Test Vector #1 */ .plaintext = "\x00\x00\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x00\x00\x00" -@@ -4533,20 +4742,7 @@ static struct hash_testvec poly1305_tv_t +@@ -4575,20 +4784,7 @@ static struct hash_testvec poly1305_tv_t /* * DES test vectors. */ @@ -4757,7 +4757,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From Applied Cryptography */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", .klen = 8, -@@ -4720,7 +4916,7 @@ static struct cipher_testvec des_enc_tv_ +@@ -4762,7 +4958,7 @@ static struct cipher_testvec des_enc_tv_ }, }; @@ -4766,7 +4766,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From Applied Cryptography */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", .klen = 8, -@@ -4830,7 +5026,7 @@ static struct cipher_testvec des_dec_tv_ +@@ -4872,7 +5068,7 @@ static struct cipher_testvec des_dec_tv_ }, }; @@ -4775,7 +4775,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From OpenSSL */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", .klen = 8, -@@ -4956,7 +5152,7 @@ static struct cipher_testvec des_cbc_enc +@@ -4998,7 +5194,7 @@ static struct cipher_testvec des_cbc_enc }, }; @@ -4784,7 +4784,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* FIPS Pub 81 */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", .klen = 8, -@@ -5065,7 +5261,7 @@ static struct cipher_testvec des_cbc_dec +@@ -5107,7 +5303,7 @@ static struct cipher_testvec des_cbc_dec }, }; @@ -4793,7 +4793,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55", .klen = 8, -@@ -5211,7 +5407,7 @@ static struct cipher_testvec des_ctr_enc +@@ -5253,7 +5449,7 @@ static struct cipher_testvec des_ctr_enc }, }; @@ -4802,7 +4802,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55", .klen = 8, -@@ -5357,7 +5553,7 @@ static struct cipher_testvec des_ctr_dec +@@ -5399,7 +5595,7 @@ static struct cipher_testvec des_ctr_dec }, }; @@ -4811,7 +4811,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* These are from openssl */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef" "\x55\x55\x55\x55\x55\x55\x55\x55" -@@ -5522,7 +5718,7 @@ static struct cipher_testvec des3_ede_en +@@ -5564,7 +5760,7 @@ static struct cipher_testvec des3_ede_en }, }; @@ -4820,7 +4820,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* These are from openssl */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef" "\x55\x55\x55\x55\x55\x55\x55\x55" -@@ -5687,7 +5883,7 @@ static struct cipher_testvec des3_ede_de +@@ -5729,7 +5925,7 @@ static struct cipher_testvec des3_ede_de }, }; @@ -4829,7 +4829,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from openssl */ .key = "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24" "\x44\x4D\x99\x5A\x12\xD6\x40\xC0" -@@ -5867,7 +6063,7 @@ static struct cipher_testvec des3_ede_cb +@@ -5909,7 +6105,7 @@ static struct cipher_testvec des3_ede_cb }, }; @@ -4838,7 +4838,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from openssl */ .key = "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24" "\x44\x4D\x99\x5A\x12\xD6\x40\xC0" -@@ -6047,7 +6243,7 @@ static struct cipher_testvec des3_ede_cb +@@ -6089,7 +6285,7 @@ static struct cipher_testvec des3_ede_cb }, }; @@ -4847,7 +4847,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x9C\xD6\xF3\x9C\xB9\x5A\x67\x00" "\x5A\x67\x00\x2D\xCE\xEB\x2D\xCE" -@@ -6325,7 +6521,7 @@ static struct cipher_testvec des3_ede_ct +@@ -6367,7 +6563,7 @@ static struct cipher_testvec des3_ede_ct }, }; @@ -4856,7 +4856,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x9C\xD6\xF3\x9C\xB9\x5A\x67\x00" "\x5A\x67\x00\x2D\xCE\xEB\x2D\xCE" -@@ -6606,14 +6802,7 @@ static struct cipher_testvec des3_ede_ct +@@ -6648,14 +6844,7 @@ static struct cipher_testvec des3_ede_ct /* * Blowfish test vectors. */ @@ -4872,7 +4872,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* DES test vectors from OpenSSL */ .key = "\x00\x00\x00\x00\x00\x00\x00\x00", .klen = 8, -@@ -6805,7 +6994,7 @@ static struct cipher_testvec bf_enc_tv_t +@@ -6847,7 +7036,7 @@ static struct cipher_testvec bf_enc_tv_t }, }; @@ -4881,7 +4881,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* DES test vectors from OpenSSL */ .key = "\x00\x00\x00\x00\x00\x00\x00\x00", .klen = 8, -@@ -6997,7 +7186,7 @@ static struct cipher_testvec bf_dec_tv_t +@@ -7039,7 +7228,7 @@ static struct cipher_testvec bf_dec_tv_t }, }; @@ -4890,7 +4890,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From OpenSSL */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef" "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87", -@@ -7154,7 +7343,7 @@ static struct cipher_testvec bf_cbc_enc_ +@@ -7196,7 +7385,7 @@ static struct cipher_testvec bf_cbc_enc_ }, }; @@ -4899,7 +4899,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From OpenSSL */ .key = "\x01\x23\x45\x67\x89\xab\xcd\xef" "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87", -@@ -7311,7 +7500,7 @@ static struct cipher_testvec bf_cbc_dec_ +@@ -7353,7 +7542,7 @@ static struct cipher_testvec bf_cbc_dec_ }, }; @@ -4908,7 +4908,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -7723,7 +7912,7 @@ static struct cipher_testvec bf_ctr_enc_ +@@ -7765,7 +7954,7 @@ static struct cipher_testvec bf_ctr_enc_ }, }; @@ -4917,7 +4917,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -8138,18 +8327,7 @@ static struct cipher_testvec bf_ctr_dec_ +@@ -8180,18 +8369,7 @@ static struct cipher_testvec bf_ctr_dec_ /* * Twofish test vectors. */ @@ -4937,7 +4937,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -8317,7 +8495,7 @@ static struct cipher_testvec tf_enc_tv_t +@@ -8359,7 +8537,7 @@ static struct cipher_testvec tf_enc_tv_t }, }; @@ -4946,7 +4946,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -8485,7 +8663,7 @@ static struct cipher_testvec tf_dec_tv_t +@@ -8527,7 +8705,7 @@ static struct cipher_testvec tf_dec_tv_t }, }; @@ -4955,7 +4955,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Nettle */ .key = zeroed_string, .klen = 16, -@@ -8668,7 +8846,7 @@ static struct cipher_testvec tf_cbc_enc_ +@@ -8710,7 +8888,7 @@ static struct cipher_testvec tf_cbc_enc_ }, }; @@ -4964,7 +4964,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Reverse of the first four above */ .key = zeroed_string, .klen = 16, -@@ -8851,7 +9029,7 @@ static struct cipher_testvec tf_cbc_dec_ +@@ -8893,7 +9071,7 @@ static struct cipher_testvec tf_cbc_dec_ }, }; @@ -4973,7 +4973,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -9262,7 +9440,7 @@ static struct cipher_testvec tf_ctr_enc_ +@@ -9304,7 +9482,7 @@ static struct cipher_testvec tf_ctr_enc_ }, }; @@ -4982,7 +4982,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -9673,7 +9851,7 @@ static struct cipher_testvec tf_ctr_dec_ +@@ -9715,7 +9893,7 @@ static struct cipher_testvec tf_ctr_dec_ }, }; @@ -4991,7 +4991,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-LRW test vectors */ { .key = "\x45\x62\xac\x25\xf8\x28\x17\x6d" -@@ -9925,7 +10103,7 @@ static struct cipher_testvec tf_lrw_enc_ +@@ -9967,7 +10145,7 @@ static struct cipher_testvec tf_lrw_enc_ }, }; @@ -5000,7 +5000,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-LRW test vectors */ /* same as enc vectors with input and result reversed */ { -@@ -10178,7 +10356,7 @@ static struct cipher_testvec tf_lrw_dec_ +@@ -10220,7 +10398,7 @@ static struct cipher_testvec tf_lrw_dec_ }, }; @@ -5009,7 +5009,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-XTS test vectors */ { .key = "\x00\x00\x00\x00\x00\x00\x00\x00" -@@ -10520,7 +10698,7 @@ static struct cipher_testvec tf_xts_enc_ +@@ -10562,7 +10740,7 @@ static struct cipher_testvec tf_xts_enc_ }, }; @@ -5018,7 +5018,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-XTS test vectors */ /* same as enc vectors with input and result reversed */ { -@@ -10867,25 +11045,7 @@ static struct cipher_testvec tf_xts_dec_ +@@ -10909,25 +11087,7 @@ static struct cipher_testvec tf_xts_dec_ * Serpent test vectors. These are backwards because Serpent writes * octet sequences in right-to-left mode. */ @@ -5045,7 +5045,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .input = "\x00\x01\x02\x03\x04\x05\x06\x07" "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", -@@ -11061,7 +11221,7 @@ static struct cipher_testvec serpent_enc +@@ -11103,7 +11263,7 @@ static struct cipher_testvec serpent_enc }, }; @@ -5054,7 +5054,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* KeySize=128, PT=0, I=1 */ .input = "\x00\x00\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x00\x00\x00", -@@ -11111,7 +11271,7 @@ static struct cipher_testvec tnepres_enc +@@ -11153,7 +11313,7 @@ static struct cipher_testvec tnepres_enc }; @@ -5063,7 +5063,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .input = "\x12\x07\xfc\xce\x9b\xd0\xd6\x47" "\x6a\xe9\x8f\xbe\xd1\x43\xa0\xe2", -@@ -11287,7 +11447,7 @@ static struct cipher_testvec serpent_dec +@@ -11329,7 +11489,7 @@ static struct cipher_testvec serpent_dec }, }; @@ -5072,7 +5072,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .input = "\x41\xcc\x6b\x31\x59\x31\x45\x97" "\x6d\x6f\xbb\x38\x4b\x37\x21\x28", -@@ -11328,7 +11488,7 @@ static struct cipher_testvec tnepres_dec +@@ -11370,7 +11530,7 @@ static struct cipher_testvec tnepres_dec }, }; @@ -5081,7 +5081,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -11469,7 +11629,7 @@ static struct cipher_testvec serpent_cbc +@@ -11511,7 +11671,7 @@ static struct cipher_testvec serpent_cbc }, }; @@ -5090,7 +5090,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -11610,7 +11770,7 @@ static struct cipher_testvec serpent_cbc +@@ -11652,7 +11812,7 @@ static struct cipher_testvec serpent_cbc }, }; @@ -5099,7 +5099,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -12021,7 +12181,7 @@ static struct cipher_testvec serpent_ctr +@@ -12063,7 +12223,7 @@ static struct cipher_testvec serpent_ctr }, }; @@ -5108,7 +5108,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -12432,7 +12592,7 @@ static struct cipher_testvec serpent_ctr +@@ -12474,7 +12634,7 @@ static struct cipher_testvec serpent_ctr }, }; @@ -5117,7 +5117,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-LRW test vectors */ { .key = "\x45\x62\xac\x25\xf8\x28\x17\x6d" -@@ -12684,7 +12844,7 @@ static struct cipher_testvec serpent_lrw +@@ -12726,7 +12886,7 @@ static struct cipher_testvec serpent_lrw }, }; @@ -5126,7 +5126,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-LRW test vectors */ /* same as enc vectors with input and result reversed */ { -@@ -12937,7 +13097,7 @@ static struct cipher_testvec serpent_lrw +@@ -12979,7 +13139,7 @@ static struct cipher_testvec serpent_lrw }, }; @@ -5135,7 +5135,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-XTS test vectors */ { .key = "\x00\x00\x00\x00\x00\x00\x00\x00" -@@ -13279,7 +13439,7 @@ static struct cipher_testvec serpent_xts +@@ -13321,7 +13481,7 @@ static struct cipher_testvec serpent_xts }, }; @@ -5144,7 +5144,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-XTS test vectors */ /* same as enc vectors with input and result reversed */ { -@@ -13623,18 +13783,7 @@ static struct cipher_testvec serpent_xts +@@ -13665,18 +13825,7 @@ static struct cipher_testvec serpent_xts }; /* Cast6 test vectors from RFC 2612 */ @@ -5164,7 +5164,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c" "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d", -@@ -13805,7 +13954,7 @@ static struct cipher_testvec cast6_enc_t +@@ -13847,7 +13996,7 @@ static struct cipher_testvec cast6_enc_t }, }; @@ -5173,7 +5173,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c" "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d", -@@ -13976,7 +14125,7 @@ static struct cipher_testvec cast6_dec_t +@@ -14018,7 +14167,7 @@ static struct cipher_testvec cast6_dec_t }, }; @@ -5182,7 +5182,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -14117,7 +14266,7 @@ static struct cipher_testvec cast6_cbc_e +@@ -14159,7 +14308,7 @@ static struct cipher_testvec cast6_cbc_e }, }; @@ -5191,7 +5191,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -14258,7 +14407,7 @@ static struct cipher_testvec cast6_cbc_d +@@ -14300,7 +14449,7 @@ static struct cipher_testvec cast6_cbc_d }, }; @@ -5200,7 +5200,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -14415,7 +14564,7 @@ static struct cipher_testvec cast6_ctr_e +@@ -14457,7 +14606,7 @@ static struct cipher_testvec cast6_ctr_e }, }; @@ -5209,7 +5209,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -14572,7 +14721,7 @@ static struct cipher_testvec cast6_ctr_d +@@ -14614,7 +14763,7 @@ static struct cipher_testvec cast6_ctr_d }, }; @@ -5218,7 +5218,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c" "\x23\x84\xcb\x1c\x77\xd6\x19\x5d" -@@ -14719,7 +14868,7 @@ static struct cipher_testvec cast6_lrw_e +@@ -14761,7 +14910,7 @@ static struct cipher_testvec cast6_lrw_e }, }; @@ -5227,7 +5227,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c" "\x23\x84\xcb\x1c\x77\xd6\x19\x5d" -@@ -14866,7 +15015,7 @@ static struct cipher_testvec cast6_lrw_d +@@ -14908,7 +15057,7 @@ static struct cipher_testvec cast6_lrw_d }, }; @@ -5236,7 +5236,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x27\x18\x28\x18\x28\x45\x90\x45" "\x23\x53\x60\x28\x74\x71\x35\x26" -@@ -15015,7 +15164,7 @@ static struct cipher_testvec cast6_xts_e +@@ -15057,7 +15206,7 @@ static struct cipher_testvec cast6_xts_e }, }; @@ -5245,7 +5245,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x27\x18\x28\x18\x28\x45\x90\x45" "\x23\x53\x60\x28\x74\x71\x35\x26" -@@ -15168,39 +15317,7 @@ static struct cipher_testvec cast6_xts_d +@@ -15210,39 +15359,7 @@ static struct cipher_testvec cast6_xts_d /* * AES test vectors. */ @@ -5286,7 +5286,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From FIPS-197 */ .key = "\x00\x01\x02\x03\x04\x05\x06\x07" "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", -@@ -15372,7 +15489,7 @@ static struct cipher_testvec aes_enc_tv_ +@@ -15414,7 +15531,7 @@ static struct cipher_testvec aes_enc_tv_ }, }; @@ -5295,7 +5295,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From FIPS-197 */ .key = "\x00\x01\x02\x03\x04\x05\x06\x07" "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", -@@ -15544,7 +15661,7 @@ static struct cipher_testvec aes_dec_tv_ +@@ -15586,7 +15703,7 @@ static struct cipher_testvec aes_dec_tv_ }, }; @@ -5304,7 +5304,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From RFC 3602 */ .key = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b" "\x51\x2e\x03\xd5\x34\x12\x00\x06", -@@ -15766,7 +15883,7 @@ static struct cipher_testvec aes_cbc_enc +@@ -15808,7 +15925,7 @@ static struct cipher_testvec aes_cbc_enc }, }; @@ -5313,7 +5313,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From RFC 3602 */ .key = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b" "\x51\x2e\x03\xd5\x34\x12\x00\x06", -@@ -15988,7 +16105,7 @@ static struct cipher_testvec aes_cbc_dec +@@ -16030,7 +16147,7 @@ static struct cipher_testvec aes_cbc_dec }, }; @@ -5322,7 +5322,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Input data from RFC 2410 Case 1 */ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -16030,7 +16147,7 @@ static struct aead_testvec hmac_md5_ecb_ +@@ -16072,7 +16189,7 @@ static struct aead_testvec hmac_md5_ecb_ }, }; @@ -5331,7 +5331,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -16072,7 +16189,7 @@ static struct aead_testvec hmac_md5_ecb_ +@@ -16114,7 +16231,7 @@ static struct aead_testvec hmac_md5_ecb_ }, }; @@ -5340,7 +5340,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* RFC 3602 Case 1 */ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -16341,7 +16458,7 @@ static struct aead_testvec hmac_sha1_aes +@@ -16383,7 +16500,7 @@ static struct aead_testvec hmac_sha1_aes }, }; @@ -5349,7 +5349,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Input data from RFC 2410 Case 1 */ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -16387,7 +16504,7 @@ static struct aead_testvec hmac_sha1_ecb +@@ -16429,7 +16546,7 @@ static struct aead_testvec hmac_sha1_ecb }, }; @@ -5358,7 +5358,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -16433,7 +16550,7 @@ static struct aead_testvec hmac_sha1_ecb +@@ -16475,7 +16592,7 @@ static struct aead_testvec hmac_sha1_ecb }, }; @@ -5367,7 +5367,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* RFC 3602 Case 1 */ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -16716,7 +16833,7 @@ static struct aead_testvec hmac_sha256_a +@@ -16758,7 +16875,7 @@ static struct aead_testvec hmac_sha256_a }, }; @@ -5376,7 +5376,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* RFC 3602 Case 1 */ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17055,9 +17172,7 @@ static struct aead_testvec hmac_sha512_a +@@ -17097,9 +17214,7 @@ static struct aead_testvec hmac_sha512_a }, }; @@ -5387,7 +5387,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17116,9 +17231,7 @@ static struct aead_testvec hmac_sha1_des +@@ -17158,9 +17273,7 @@ static struct aead_testvec hmac_sha1_des }, }; @@ -5398,7 +5398,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17177,9 +17290,7 @@ static struct aead_testvec hmac_sha224_d +@@ -17219,9 +17332,7 @@ static struct aead_testvec hmac_sha224_d }, }; @@ -5409,7 +5409,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17240,9 +17351,7 @@ static struct aead_testvec hmac_sha256_d +@@ -17282,9 +17393,7 @@ static struct aead_testvec hmac_sha256_d }, }; @@ -5420,7 +5420,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17307,9 +17416,7 @@ static struct aead_testvec hmac_sha384_d +@@ -17349,9 +17458,7 @@ static struct aead_testvec hmac_sha384_d }, }; @@ -5431,7 +5431,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17378,9 +17485,7 @@ static struct aead_testvec hmac_sha512_d +@@ -17420,9 +17527,7 @@ static struct aead_testvec hmac_sha512_d }, }; @@ -5442,7 +5442,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17441,9 +17546,7 @@ static struct aead_testvec hmac_sha1_des +@@ -17483,9 +17588,7 @@ static struct aead_testvec hmac_sha1_des }, }; @@ -5453,7 +5453,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17504,9 +17607,7 @@ static struct aead_testvec hmac_sha224_d +@@ -17546,9 +17649,7 @@ static struct aead_testvec hmac_sha224_d }, }; @@ -5464,7 +5464,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17569,9 +17670,7 @@ static struct aead_testvec hmac_sha256_d +@@ -17611,9 +17712,7 @@ static struct aead_testvec hmac_sha256_d }, }; @@ -5475,7 +5475,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17638,9 +17737,7 @@ static struct aead_testvec hmac_sha384_d +@@ -17680,9 +17779,7 @@ static struct aead_testvec hmac_sha384_d }, }; @@ -5486,7 +5486,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /*Generated with cryptopp*/ #ifdef __LITTLE_ENDIAN .key = "\x08\x00" /* rta length */ -@@ -17711,7 +17808,7 @@ static struct aead_testvec hmac_sha512_d +@@ -17753,7 +17850,7 @@ static struct aead_testvec hmac_sha512_d }, }; @@ -5495,7 +5495,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */ { /* LRW-32-AES 1 */ .key = "\x45\x62\xac\x25\xf8\x28\x17\x6d" -@@ -17964,7 +18061,7 @@ static struct cipher_testvec aes_lrw_enc +@@ -18006,7 +18103,7 @@ static struct cipher_testvec aes_lrw_enc } }; @@ -5504,7 +5504,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */ /* same as enc vectors with input and result reversed */ { /* LRW-32-AES 1 */ -@@ -18218,7 +18315,7 @@ static struct cipher_testvec aes_lrw_dec +@@ -18260,7 +18357,7 @@ static struct cipher_testvec aes_lrw_dec } }; @@ -5513,7 +5513,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */ { /* XTS-AES 1 */ .key = "\x00\x00\x00\x00\x00\x00\x00\x00" -@@ -18561,7 +18658,7 @@ static struct cipher_testvec aes_xts_enc +@@ -18603,7 +18700,7 @@ static struct cipher_testvec aes_xts_enc } }; @@ -5522,7 +5522,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */ { /* XTS-AES 1 */ .key = "\x00\x00\x00\x00\x00\x00\x00\x00" -@@ -18905,7 +19002,7 @@ static struct cipher_testvec aes_xts_dec +@@ -18947,7 +19044,7 @@ static struct cipher_testvec aes_xts_dec }; @@ -5531,7 +5531,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From NIST Special Publication 800-38A, Appendix F.5 */ .key = "\x2b\x7e\x15\x16\x28\xae\xd2\xa6" "\xab\xf7\x15\x88\x09\xcf\x4f\x3c", -@@ -19260,7 +19357,7 @@ static struct cipher_testvec aes_ctr_enc +@@ -19302,7 +19399,7 @@ static struct cipher_testvec aes_ctr_enc }, }; @@ -5540,7 +5540,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From NIST Special Publication 800-38A, Appendix F.5 */ .key = "\x2b\x7e\x15\x16\x28\xae\xd2\xa6" "\xab\xf7\x15\x88\x09\xcf\x4f\x3c", -@@ -19615,7 +19712,7 @@ static struct cipher_testvec aes_ctr_dec +@@ -19657,7 +19754,7 @@ static struct cipher_testvec aes_ctr_dec }, }; @@ -5549,7 +5549,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From RFC 3686 */ .key = "\xae\x68\x52\xf8\x12\x10\x67\xcc" "\x4b\xf7\xa5\x76\x55\x77\xf3\x9e" -@@ -20747,7 +20844,7 @@ static struct cipher_testvec aes_ctr_rfc +@@ -20789,7 +20886,7 @@ static struct cipher_testvec aes_ctr_rfc }, }; @@ -5558,7 +5558,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From RFC 3686 */ .key = "\xae\x68\x52\xf8\x12\x10\x67\xcc" "\x4b\xf7\xa5\x76\x55\x77\xf3\x9e" -@@ -20838,7 +20935,7 @@ static struct cipher_testvec aes_ctr_rfc +@@ -20880,7 +20977,7 @@ static struct cipher_testvec aes_ctr_rfc }, }; @@ -5567,7 +5567,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* From NIST Special Publication 800-38A, Appendix F.5 */ { .key = "\x2b\x7e\x15\x16\x28\xae\xd2\xa6" -@@ -20867,7 +20964,7 @@ static struct cipher_testvec aes_ofb_enc +@@ -20909,7 +21006,7 @@ static struct cipher_testvec aes_ofb_enc } }; @@ -5576,7 +5576,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* From NIST Special Publication 800-38A, Appendix F.5 */ { .key = "\x2b\x7e\x15\x16\x28\xae\xd2\xa6" -@@ -20896,7 +20993,7 @@ static struct cipher_testvec aes_ofb_dec +@@ -20938,7 +21035,7 @@ static struct cipher_testvec aes_ofb_dec } }; @@ -5585,7 +5585,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From McGrew & Viega - http://citeseer.ist.psu.edu/656989.html */ .key = zeroed_string, .klen = 16, -@@ -21056,7 +21153,7 @@ static struct aead_testvec aes_gcm_enc_t +@@ -21098,7 +21195,7 @@ static struct aead_testvec aes_gcm_enc_t } }; @@ -5594,7 +5594,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From McGrew & Viega - http://citeseer.ist.psu.edu/656989.html */ .key = zeroed_string, .klen = 32, -@@ -21258,7 +21355,7 @@ static struct aead_testvec aes_gcm_dec_t +@@ -21300,7 +21397,7 @@ static struct aead_testvec aes_gcm_dec_t } }; @@ -5603,7 +5603,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated using Crypto++ */ .key = zeroed_string, .klen = 20, -@@ -21871,7 +21968,7 @@ static struct aead_testvec aes_gcm_rfc41 +@@ -21913,7 +22010,7 @@ static struct aead_testvec aes_gcm_rfc41 } }; @@ -5612,7 +5612,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated using Crypto++ */ .key = zeroed_string, .klen = 20, -@@ -22485,7 +22582,7 @@ static struct aead_testvec aes_gcm_rfc41 +@@ -22527,7 +22624,7 @@ static struct aead_testvec aes_gcm_rfc41 } }; @@ -5621,7 +5621,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From draft-mcgrew-gcm-test-01 */ .key = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda" "\x90\x6a\xc7\x3c\x36\x13\xa6\x34" -@@ -22516,7 +22613,7 @@ static struct aead_testvec aes_gcm_rfc45 +@@ -22558,7 +22655,7 @@ static struct aead_testvec aes_gcm_rfc45 } }; @@ -5630,7 +5630,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From draft-mcgrew-gcm-test-01 */ .key = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda" "\x90\x6a\xc7\x3c\x36\x13\xa6\x34" -@@ -22575,7 +22672,7 @@ static struct aead_testvec aes_gcm_rfc45 +@@ -22617,7 +22714,7 @@ static struct aead_testvec aes_gcm_rfc45 }, }; @@ -5639,7 +5639,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From RFC 3610 */ .key = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7" "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf", -@@ -22859,7 +22956,7 @@ static struct aead_testvec aes_ccm_enc_t +@@ -22901,7 +22998,7 @@ static struct aead_testvec aes_ccm_enc_t } }; @@ -5648,7 +5648,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* From RFC 3610 */ .key = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7" "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf", -@@ -23191,7 +23288,7 @@ static struct aead_testvec aes_ccm_dec_t +@@ -23233,7 +23330,7 @@ static struct aead_testvec aes_ccm_dec_t * These vectors are copied/generated from the ones for rfc4106 with * the key truncated by one byte.. */ @@ -5657,7 +5657,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated using Crypto++ */ .key = zeroed_string, .klen = 19, -@@ -23804,7 +23901,7 @@ static struct aead_testvec aes_ccm_rfc43 +@@ -23846,7 +23943,7 @@ static struct aead_testvec aes_ccm_rfc43 } }; @@ -5666,7 +5666,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated using Crypto++ */ .key = zeroed_string, .klen = 19, -@@ -24420,9 +24517,7 @@ static struct aead_testvec aes_ccm_rfc43 +@@ -24462,9 +24559,7 @@ static struct aead_testvec aes_ccm_rfc43 /* * ChaCha20-Poly1305 AEAD test vectors from RFC7539 2.8.2./A.5. */ @@ -5677,7 +5677,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x80\x81\x82\x83\x84\x85\x86\x87" "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" -@@ -24554,7 +24649,7 @@ static struct aead_testvec rfc7539_enc_t +@@ -24596,7 +24691,7 @@ static struct aead_testvec rfc7539_enc_t }, }; @@ -5686,7 +5686,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x80\x81\x82\x83\x84\x85\x86\x87" "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" -@@ -24689,9 +24784,7 @@ static struct aead_testvec rfc7539_dec_t +@@ -24731,9 +24826,7 @@ static struct aead_testvec rfc7539_dec_t /* * draft-irtf-cfrg-chacha20-poly1305 */ @@ -5697,7 +5697,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a" "\xf3\x33\x88\x86\x04\xf6\xb5\xf0" -@@ -24779,7 +24872,7 @@ static struct aead_testvec rfc7539esp_en +@@ -24821,7 +24914,7 @@ static struct aead_testvec rfc7539esp_en }, }; @@ -5706,7 +5706,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a" "\xf3\x33\x88\x86\x04\xf6\xb5\xf0" -@@ -24875,7 +24968,7 @@ static struct aead_testvec rfc7539esp_de +@@ -24917,7 +25010,7 @@ static struct aead_testvec rfc7539esp_de * semiblock of the ciphertext from the test vector. For decryption, iv is * the first semiblock of the ciphertext. */ @@ -5715,7 +5715,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x75\x75\xda\x3a\x93\x60\x7c\xc2" "\xbf\xd8\xce\xc7\xaa\xdf\xd9\xa6", -@@ -24890,7 +24983,7 @@ static struct cipher_testvec aes_kw_enc_ +@@ -24932,7 +25025,7 @@ static struct cipher_testvec aes_kw_enc_ }, }; @@ -5724,7 +5724,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x80\xaa\x99\x73\x27\xa4\x80\x6b" "\x6a\x7a\x41\xa5\x2b\x86\xc3\x71" -@@ -24913,9 +25006,7 @@ static struct cipher_testvec aes_kw_dec_ +@@ -24955,9 +25048,7 @@ static struct cipher_testvec aes_kw_dec_ * http://csrc.nist.gov/groups/STM/cavp/documents/rng/RNGVS.pdf * Only AES-128 is supported at this time. */ @@ -5735,7 +5735,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\xf3\xb1\x66\x6d\x13\x60\x72\x42" "\xed\x06\x1c\xab\xb8\xd4\x62\x02", -@@ -25011,7 +25102,7 @@ static struct cprng_testvec ansi_cprng_a +@@ -25053,7 +25144,7 @@ static struct cprng_testvec ansi_cprng_a * (Hash, HMAC, CTR) are tested with all permutations of use cases (w/ and * w/o personalization string, w/ and w/o additional input string). */ @@ -5744,7 +5744,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\x72\x88\x4c\xcd\x6c\x85\x57\x70\xf7\x0b\x8b\x86" -@@ -25169,7 +25260,7 @@ static struct drbg_testvec drbg_pr_sha25 +@@ -25211,7 +25302,7 @@ static struct drbg_testvec drbg_pr_sha25 }, }; @@ -5753,7 +5753,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\x99\x69\xe5\x4b\x47\x03\xff\x31\x78\x5b\x87\x9a" -@@ -25327,7 +25418,7 @@ static struct drbg_testvec drbg_pr_hmac_ +@@ -25369,7 +25460,7 @@ static struct drbg_testvec drbg_pr_hmac_ }, }; @@ -5762,7 +5762,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\xd1\x44\xc6\x61\x81\x6d\xca\x9d\x15\x28\x8a\x42" -@@ -25451,7 +25542,7 @@ static struct drbg_testvec drbg_pr_ctr_a +@@ -25493,7 +25584,7 @@ static struct drbg_testvec drbg_pr_ctr_a * (Hash, HMAC, CTR) are tested with all permutations of use cases (w/ and * w/o personalization string, w/ and w/o additional input string). */ @@ -5771,7 +5771,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\xa6\x5a\xd0\xf3\x45\xdb\x4e\x0e\xff\xe8\x75\xc3" -@@ -25573,7 +25664,7 @@ static struct drbg_testvec drbg_nopr_sha +@@ -25615,7 +25706,7 @@ static struct drbg_testvec drbg_nopr_sha }, }; @@ -5780,7 +5780,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\xca\x85\x19\x11\x34\x93\x84\xbf\xfe\x89\xde\x1c" -@@ -25695,7 +25786,7 @@ static struct drbg_testvec drbg_nopr_hma +@@ -25737,7 +25828,7 @@ static struct drbg_testvec drbg_nopr_hma }, }; @@ -5789,7 +5789,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\xc3\x5c\x2f\xa2\xa8\x9d\x52\xa1\x1f\xa3\x2a\xa9" -@@ -25719,7 +25810,7 @@ static struct drbg_testvec drbg_nopr_ctr +@@ -25761,7 +25852,7 @@ static struct drbg_testvec drbg_nopr_ctr }, }; @@ -5798,7 +5798,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\x36\x40\x19\x40\xfa\x8b\x1f\xba\x91\xa1\x66\x1f" -@@ -25743,7 +25834,7 @@ static struct drbg_testvec drbg_nopr_ctr +@@ -25785,7 +25876,7 @@ static struct drbg_testvec drbg_nopr_ctr }, }; @@ -5807,7 +5807,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .entropy = (unsigned char *) "\x87\xe1\xc5\x32\x99\x7f\x57\xa3\x5c\x28\x6d\xe8" -@@ -25832,14 +25923,7 @@ static struct drbg_testvec drbg_nopr_ctr +@@ -25874,14 +25965,7 @@ static struct drbg_testvec drbg_nopr_ctr }; /* Cast5 test vectors from RFC 2144 */ @@ -5823,7 +5823,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x01\x23\x45\x67\x12\x34\x56\x78" "\x23\x45\x67\x89\x34\x56\x78\x9a", -@@ -26000,7 +26084,7 @@ static struct cipher_testvec cast5_enc_t +@@ -26042,7 +26126,7 @@ static struct cipher_testvec cast5_enc_t }, }; @@ -5832,7 +5832,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x01\x23\x45\x67\x12\x34\x56\x78" "\x23\x45\x67\x89\x34\x56\x78\x9a", -@@ -26161,7 +26245,7 @@ static struct cipher_testvec cast5_dec_t +@@ -26203,7 +26287,7 @@ static struct cipher_testvec cast5_dec_t }, }; @@ -5841,7 +5841,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A", -@@ -26299,7 +26383,7 @@ static struct cipher_testvec cast5_cbc_e +@@ -26341,7 +26425,7 @@ static struct cipher_testvec cast5_cbc_e }, }; @@ -5850,7 +5850,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A", -@@ -26437,7 +26521,7 @@ static struct cipher_testvec cast5_cbc_d +@@ -26479,7 +26563,7 @@ static struct cipher_testvec cast5_cbc_d }, }; @@ -5859,7 +5859,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A", -@@ -26588,7 +26672,7 @@ static struct cipher_testvec cast5_ctr_e +@@ -26630,7 +26714,7 @@ static struct cipher_testvec cast5_ctr_e }, }; @@ -5868,7 +5868,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated from TF test vectors */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A", -@@ -26742,10 +26826,7 @@ static struct cipher_testvec cast5_ctr_d +@@ -26784,10 +26868,7 @@ static struct cipher_testvec cast5_ctr_d /* * ARC4 test vectors from OpenSSL */ @@ -5880,7 +5880,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", .klen = 8, -@@ -26811,7 +26892,7 @@ static struct cipher_testvec arc4_enc_tv +@@ -26853,7 +26934,7 @@ static struct cipher_testvec arc4_enc_tv }, }; @@ -5889,7 +5889,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", .klen = 8, -@@ -26880,10 +26961,7 @@ static struct cipher_testvec arc4_dec_tv +@@ -26922,10 +27003,7 @@ static struct cipher_testvec arc4_dec_tv /* * TEA test vectors */ @@ -5901,7 +5901,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -26926,7 +27004,7 @@ static struct cipher_testvec tea_enc_tv_ +@@ -26968,7 +27046,7 @@ static struct cipher_testvec tea_enc_tv_ } }; @@ -5910,7 +5910,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -26972,10 +27050,7 @@ static struct cipher_testvec tea_dec_tv_ +@@ -27014,10 +27092,7 @@ static struct cipher_testvec tea_dec_tv_ /* * XTEA test vectors */ @@ -5922,7 +5922,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -27018,7 +27093,7 @@ static struct cipher_testvec xtea_enc_tv +@@ -27060,7 +27135,7 @@ static struct cipher_testvec xtea_enc_tv } }; @@ -5931,7 +5931,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -27064,10 +27139,7 @@ static struct cipher_testvec xtea_dec_tv +@@ -27106,10 +27181,7 @@ static struct cipher_testvec xtea_dec_tv /* * KHAZAD test vectors. */ @@ -5943,7 +5943,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x80\x00\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x00\x00\x00", -@@ -27113,7 +27185,7 @@ static struct cipher_testvec khazad_enc_ +@@ -27155,7 +27227,7 @@ static struct cipher_testvec khazad_enc_ }, }; @@ -5952,7 +5952,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x80\x00\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x00\x00\x00", -@@ -27163,12 +27235,7 @@ static struct cipher_testvec khazad_dec_ +@@ -27205,12 +27277,7 @@ static struct cipher_testvec khazad_dec_ * Anubis test vectors. */ @@ -5966,7 +5966,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe" "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe", -@@ -27231,7 +27298,7 @@ static struct cipher_testvec anubis_enc_ +@@ -27273,7 +27340,7 @@ static struct cipher_testvec anubis_enc_ }, }; @@ -5975,7 +5975,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe" "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe", -@@ -27294,7 +27361,7 @@ static struct cipher_testvec anubis_dec_ +@@ -27336,7 +27403,7 @@ static struct cipher_testvec anubis_dec_ }, }; @@ -5984,7 +5984,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe" "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe", -@@ -27329,7 +27396,7 @@ static struct cipher_testvec anubis_cbc_ +@@ -27371,7 +27438,7 @@ static struct cipher_testvec anubis_cbc_ }, }; @@ -5993,7 +5993,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe" "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe", -@@ -27367,10 +27434,7 @@ static struct cipher_testvec anubis_cbc_ +@@ -27409,10 +27476,7 @@ static struct cipher_testvec anubis_cbc_ /* * XETA test vectors */ @@ -6005,7 +6005,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -27413,7 +27477,7 @@ static struct cipher_testvec xeta_enc_tv +@@ -27455,7 +27519,7 @@ static struct cipher_testvec xeta_enc_tv } }; @@ -6014,7 +6014,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -27459,10 +27523,7 @@ static struct cipher_testvec xeta_dec_tv +@@ -27501,10 +27565,7 @@ static struct cipher_testvec xeta_dec_tv /* * FCrypt test vectors */ @@ -6026,7 +6026,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* http://www.openafs.org/pipermail/openafs-devel/2000-December/005320.html */ .key = "\x00\x00\x00\x00\x00\x00\x00\x00", .klen = 8, -@@ -27523,7 +27584,7 @@ static struct cipher_testvec fcrypt_pcbc +@@ -27565,7 +27626,7 @@ static struct cipher_testvec fcrypt_pcbc } }; @@ -6035,7 +6035,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* http://www.openafs.org/pipermail/openafs-devel/2000-December/005320.html */ .key = "\x00\x00\x00\x00\x00\x00\x00\x00", .klen = 8, -@@ -27587,18 +27648,7 @@ static struct cipher_testvec fcrypt_pcbc +@@ -27629,18 +27690,7 @@ static struct cipher_testvec fcrypt_pcbc /* * CAMELLIA test vectors. */ @@ -6055,7 +6055,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x01\x23\x45\x67\x89\xab\xcd\xef" "\xfe\xdc\xba\x98\x76\x54\x32\x10", -@@ -27898,7 +27948,7 @@ static struct cipher_testvec camellia_en +@@ -27940,7 +27990,7 @@ static struct cipher_testvec camellia_en }, }; @@ -6064,7 +6064,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x01\x23\x45\x67\x89\xab\xcd\xef" "\xfe\xdc\xba\x98\x76\x54\x32\x10", -@@ -28198,7 +28248,7 @@ static struct cipher_testvec camellia_de +@@ -28240,7 +28290,7 @@ static struct cipher_testvec camellia_de }, }; @@ -6073,7 +6073,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b" "\x51\x2e\x03\xd5\x34\x12\x00\x06", -@@ -28494,7 +28544,7 @@ static struct cipher_testvec camellia_cb +@@ -28536,7 +28586,7 @@ static struct cipher_testvec camellia_cb }, }; @@ -6082,7 +6082,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b" "\x51\x2e\x03\xd5\x34\x12\x00\x06", -@@ -28790,7 +28840,7 @@ static struct cipher_testvec camellia_cb +@@ -28832,7 +28882,7 @@ static struct cipher_testvec camellia_cb }, }; @@ -6091,7 +6091,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -29457,7 +29507,7 @@ static struct cipher_testvec camellia_ct +@@ -29499,7 +29549,7 @@ static struct cipher_testvec camellia_ct }, }; @@ -6100,7 +6100,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* Generated with Crypto++ */ .key = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9" "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A" -@@ -30124,7 +30174,7 @@ static struct cipher_testvec camellia_ct +@@ -30166,7 +30216,7 @@ static struct cipher_testvec camellia_ct }, }; @@ -6109,7 +6109,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-LRW test vectors */ { .key = "\x45\x62\xac\x25\xf8\x28\x17\x6d" -@@ -30376,7 +30426,7 @@ static struct cipher_testvec camellia_lr +@@ -30418,7 +30468,7 @@ static struct cipher_testvec camellia_lr }, }; @@ -6118,7 +6118,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-LRW test vectors */ /* same as enc vectors with input and result reversed */ { -@@ -30629,7 +30679,7 @@ static struct cipher_testvec camellia_lr +@@ -30671,7 +30721,7 @@ static struct cipher_testvec camellia_lr }, }; @@ -6127,7 +6127,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-XTS test vectors */ { .key = "\x00\x00\x00\x00\x00\x00\x00\x00" -@@ -30971,7 +31021,7 @@ static struct cipher_testvec camellia_xt +@@ -31013,7 +31063,7 @@ static struct cipher_testvec camellia_xt }, }; @@ -6136,7 +6136,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Generated from AES-XTS test vectors */ /* same as enc vectors with input and result reversed */ { -@@ -31317,10 +31367,7 @@ static struct cipher_testvec camellia_xt +@@ -31359,10 +31409,7 @@ static struct cipher_testvec camellia_xt /* * SEED test vectors */ @@ -6148,7 +6148,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -31362,7 +31409,7 @@ static struct cipher_testvec seed_enc_tv +@@ -31404,7 +31451,7 @@ static struct cipher_testvec seed_enc_tv } }; @@ -6157,7 +6157,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = zeroed_string, .klen = 16, -@@ -31404,8 +31451,7 @@ static struct cipher_testvec seed_dec_tv +@@ -31446,8 +31493,7 @@ static struct cipher_testvec seed_dec_tv } }; @@ -6167,7 +6167,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* * Testvectors from verified.test-vectors submitted to ECRYPT. * They are truncated to size 39, 64, 111, 129 to test a variety -@@ -32574,8 +32620,7 @@ static struct cipher_testvec salsa20_str +@@ -32616,8 +32662,7 @@ static struct cipher_testvec salsa20_str }, }; @@ -6177,7 +6177,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* RFC7539 A.2. Test Vector #1 */ .key = "\x00\x00\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x00\x00\x00" -@@ -33086,9 +33131,7 @@ static struct cipher_testvec chacha20_en +@@ -33128,9 +33173,7 @@ static struct cipher_testvec chacha20_en /* * CTS (Cipher Text Stealing) mode tests */ @@ -6188,7 +6188,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* from rfc3962 */ .klen = 16, .key = "\x63\x68\x69\x63\x6b\x65\x6e\x20" -@@ -33190,7 +33233,7 @@ static struct cipher_testvec cts_mode_en +@@ -33232,7 +33275,7 @@ static struct cipher_testvec cts_mode_en } }; @@ -6197,7 +6197,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { /* from rfc3962 */ .klen = 16, .key = "\x63\x68\x69\x63\x6b\x65\x6e\x20" -@@ -33308,10 +33351,7 @@ struct comp_testvec { +@@ -33350,10 +33393,7 @@ struct comp_testvec { * Params: winbits=-11, Z_DEFAULT_COMPRESSION, MAX_MEM_LEVEL. */ @@ -6209,7 +6209,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .inlen = 70, .outlen = 38, -@@ -33347,7 +33387,7 @@ static struct comp_testvec deflate_comp_ +@@ -33389,7 +33429,7 @@ static struct comp_testvec deflate_comp_ }, }; @@ -6218,7 +6218,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .inlen = 122, .outlen = 191, -@@ -33386,10 +33426,7 @@ static struct comp_testvec deflate_decom +@@ -33428,10 +33468,7 @@ static struct comp_testvec deflate_decom /* * LZO test vectors (null-terminated strings). */ @@ -6230,7 +6230,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .inlen = 70, .outlen = 57, -@@ -33429,7 +33466,7 @@ static struct comp_testvec lzo_comp_tv_t +@@ -33471,7 +33508,7 @@ static struct comp_testvec lzo_comp_tv_t }, }; @@ -6239,7 +6239,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .inlen = 133, .outlen = 159, -@@ -33472,7 +33509,7 @@ static struct comp_testvec lzo_decomp_tv +@@ -33514,7 +33551,7 @@ static struct comp_testvec lzo_decomp_tv */ #define MICHAEL_MIC_TEST_VECTORS 6 @@ -6248,7 +6248,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x00\x00\x00\x00\x00\x00\x00\x00", .ksize = 8, -@@ -33520,9 +33557,7 @@ static struct hash_testvec michael_mic_t +@@ -33562,9 +33599,7 @@ static struct hash_testvec michael_mic_t /* * CRC32 test vectors */ @@ -6259,7 +6259,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .key = "\x87\xa9\xcb\xed", .ksize = 4, -@@ -33954,9 +33989,7 @@ static struct hash_testvec crc32_tv_temp +@@ -33996,9 +34031,7 @@ static struct hash_testvec crc32_tv_temp /* * CRC32C test vectors */ @@ -6270,7 +6270,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .psize = 0, .digest = "\x00\x00\x00\x00", -@@ -34392,9 +34425,7 @@ static struct hash_testvec crc32c_tv_tem +@@ -34434,9 +34467,7 @@ static struct hash_testvec crc32c_tv_tem /* * Blakcifn CRC test vectors */ @@ -6281,7 +6281,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { .psize = 0, .digest = "\x00\x00\x00\x00", -@@ -34479,9 +34510,6 @@ static struct hash_testvec bfin_crc_tv_t +@@ -34521,9 +34552,6 @@ static struct hash_testvec bfin_crc_tv_t }; @@ -6291,7 +6291,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> static struct comp_testvec lz4_comp_tv_template[] = { { .inlen = 70, -@@ -34512,9 +34540,6 @@ static struct comp_testvec lz4_decomp_tv +@@ -34554,9 +34582,6 @@ static struct comp_testvec lz4_decomp_tv }, }; diff --git a/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch b/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch index 4b32417379..5971fdcbe7 100644 --- a/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch +++ b/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch @@ -482,7 +482,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> sdhci_get_of_property(pdev); --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -1631,26 +1631,24 @@ static void sdhci_set_ios(struct mmc_hos +@@ -1629,26 +1629,24 @@ static void sdhci_set_ios(struct mmc_hos ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); @@ -523,7 +523,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> if (!host->preset_enabled) { sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); /* -@@ -1963,7 +1961,7 @@ static int sdhci_prepare_hs400_tuning(st +@@ -1961,7 +1959,7 @@ static int sdhci_prepare_hs400_tuning(st return 0; } @@ -532,7 +532,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { struct sdhci_host *host = mmc_priv(mmc); u16 ctrl; -@@ -2022,6 +2020,9 @@ static int sdhci_execute_tuning(struct m +@@ -2020,6 +2018,9 @@ static int sdhci_execute_tuning(struct m return err; } @@ -542,7 +542,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); ctrl |= SDHCI_CTRL_EXEC_TUNING; if (host->quirks2 & SDHCI_QUIRK2_TUNING_WORK_AROUND) -@@ -2134,9 +2135,10 @@ static int sdhci_execute_tuning(struct m +@@ -2132,9 +2133,10 @@ static int sdhci_execute_tuning(struct m ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); @@ -556,7 +556,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> } while (ctrl & SDHCI_CTRL_EXEC_TUNING); /* -@@ -2172,6 +2174,7 @@ out_unlock: +@@ -2170,6 +2172,7 @@ out_unlock: spin_unlock_irqrestore(&host->lock, flags); return err; } @@ -564,7 +564,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> static int sdhci_select_drive_strength(struct mmc_card *card, unsigned int max_dtr, int host_drv, -@@ -3004,6 +3007,8 @@ struct sdhci_host *sdhci_alloc_host(stru +@@ -2994,6 +2997,8 @@ struct sdhci_host *sdhci_alloc_host(stru host->flags = SDHCI_SIGNALING_330; |