OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 143... Line 143...
143 $(eval $(call KernelPackage,crypto-cts)) 143 $(eval $(call KernelPackage,crypto-cts))
Line 144... Line 144...
144   144  
145   145  
146 define KernelPackage/crypto-deflate 146 define KernelPackage/crypto-deflate
147 TITLE:=Deflate compression CryptoAPI module 147 TITLE:=Deflate compression CryptoAPI module
148 DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +!(LINUX_3_18||LINUX_4_9):kmod-crypto-acompress 148 DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +LINUX_4_14:kmod-crypto-acompress
149 KCONFIG:=CONFIG_CRYPTO_DEFLATE 149 KCONFIG:=CONFIG_CRYPTO_DEFLATE
150 FILES:=$(LINUX_DIR)/crypto/deflate.ko 150 FILES:=$(LINUX_DIR)/crypto/deflate.ko
151 AUTOLOAD:=$(call AutoLoad,09,deflate) 151 AUTOLOAD:=$(call AutoLoad,09,deflate)
Line 178... Line 178...
178 $(eval $(call KernelPackage,crypto-ecb)) 178 $(eval $(call KernelPackage,crypto-ecb))
Line 179... Line 179...
179   179  
180   180  
181 define KernelPackage/crypto-ecdh 181 define KernelPackage/crypto-ecdh
182 TITLE:=ECDH algorithm 182 TITLE:=ECDH algorithm
183 DEPENDS:=@!LINUX_3_18 +kmod-crypto-kpp 183 DEPENDS:=@!(LINUX_3_18||LINUX_4_4) +kmod-crypto-kpp
184 KCONFIG:= CONFIG_CRYPTO_ECDH 184 KCONFIG:= CONFIG_CRYPTO_ECDH
185 FILES:= \ 185 FILES:= \
186 $(LINUX_DIR)/crypto/ecdh_generic.ko 186 $(LINUX_DIR)/crypto/ecdh_generic.ko
Line 272... Line 272...
272 $(eval $(call KernelPackage,crypto-hmac)) 272 $(eval $(call KernelPackage,crypto-hmac))
Line 273... Line 273...
273   273  
274   274  
275 define KernelPackage/crypto-hw-ccp 275 define KernelPackage/crypto-hw-ccp
276 TITLE:=AMD Cryptographic Coprocessor 276 TITLE:=AMD Cryptographic Coprocessor
277 DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 +!(LINUX_3_18||LINUX_4_9):kmod-crypto-rsa 277 DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 +LINUX_4_14:kmod-crypto-rsa
278 KCONFIG:= \ 278 KCONFIG:= \
279 CONFIG_CRYPTO_HW=y \ 279 CONFIG_CRYPTO_HW=y \
280 CONFIG_CRYPTO_DEV_CCP=y \ 280 CONFIG_CRYPTO_DEV_CCP=y \
Line 439... Line 439...
439 $(eval $(call KernelPackage,crypto-michael-mic)) 439 $(eval $(call KernelPackage,crypto-michael-mic))
Line 440... Line 440...
440   440  
441   441  
442 define KernelPackage/crypto-misc 442 define KernelPackage/crypto-misc
443 TITLE:=Other CryptoAPI modules 443 TITLE:=Other CryptoAPI modules
444 DEPENDS:=+kmod-crypto-xts -  
445 KCONFIG:= \ -  
446 CONFIG_CRYPTO_CAMELLIA_X86_64 \ -  
447 CONFIG_CRYPTO_BLOWFISH_X86_64 \ -  
448 CONFIG_CRYPTO_TWOFISH_X86_64 \ -  
449 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY \ -  
450 CONFIG_CRYPTO_SERPENT_SSE2_X86_64 \ -  
451 CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 \ -  
452 CONFIG_CRYPTO_CAST5_AVX_X86_64 \ -  
453 CONFIG_CRYPTO_CAST6_AVX_X86_64 \ -  
454 CONFIG_CRYPTO_TWOFISH_AVX_X86_64 \ -  
455 CONFIG_CRYPTO_SERPENT_AVX_X86_64 \ -  
456 CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 \ -  
457 CONFIG_CRYPTO_SERPENT_AVX2_X86_64 \ 444 DEPENDS:=+kmod-crypto-manager
458 CONFIG_CRYPTO_SERPENT_SSE2_586 \ 445 KCONFIG:= \
459 CONFIG_CRYPTO_ANUBIS \ 446 CONFIG_CRYPTO_ANUBIS \
460 CONFIG_CRYPTO_BLOWFISH \ 447 CONFIG_CRYPTO_BLOWFISH \
461 CONFIG_CRYPTO_CAMELLIA \ 448 CONFIG_CRYPTO_CAMELLIA \
Line 483... Line 470...
483 $(LINUX_DIR)/crypto/wp512.ko \ 470 $(LINUX_DIR)/crypto/wp512.ko \
484 $(LINUX_DIR)/crypto/twofish_generic.ko \ 471 $(LINUX_DIR)/crypto/twofish_generic.ko \
485 $(LINUX_DIR)/crypto/blowfish_common.ko \ 472 $(LINUX_DIR)/crypto/blowfish_common.ko \
486 $(LINUX_DIR)/crypto/blowfish_generic.ko \ 473 $(LINUX_DIR)/crypto/blowfish_generic.ko \
487 $(LINUX_DIR)/crypto/serpent_generic.ko 474 $(LINUX_DIR)/crypto/serpent_generic.ko
488 AUTOLOAD:=$(call AutoLoad,10,anubis camellia_generic cast_common \ -  
489 cast5_generic cast6_generic khazad tea tgr192 twofish_common \ -  
490 wp512 blowfish_common serpent_generic) -  
491 ifndef CONFIG_TARGET_x86 -  
492 AUTOLOAD+= $(call AutoLoad,10,twofish_generic blowfish_generic) -  
493 endif -  
494 $(call AddDepends/crypto) 475 $(call AddDepends/crypto)
495 endef 476 endef
Line 496... Line 477...
496   477  
497 ifndef CONFIG_TARGET_x86_64 478 ifndef CONFIG_TARGET_x86_64
498 define KernelPackage/crypto-misc/x86 -  
499 FILES+= \ 479 define KernelPackage/crypto-misc/x86
500 $(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \ -  
501 $(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \ -  
502 $(LINUX_DIR)/arch/x86/crypto/glue_helper.ko \ -  
503 $(LINUX_DIR)/crypto/ablk_helper.ko@lt4.17 \ -  
504 $(LINUX_DIR)/crypto/cryptd.ko \ -  
505 $(LINUX_DIR)/crypto/lrw.ko@lt4.17 \ -  
506 $(LINUX_DIR)/crypto/crypto_simd.ko@ge4.17 -  
507 AUTOLOAD+= $(call AutoLoad,10,cryptd glue_helper \ -  
508 serpent-sse2-i586 twofish-i586 blowfish_generic) 480 FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko
509 endef 481 endef
Line 510... Line -...
510 endif -  
511   -  
512 define KernelPackage/crypto-misc/x86/64 -  
513 FILES+= \ -  
514 $(LINUX_DIR)/arch/x86/crypto/camellia-x86_64.ko \ -  
515 $(LINUX_DIR)/arch/x86/crypto/blowfish-x86_64.ko \ -  
516 $(LINUX_DIR)/arch/x86/crypto/twofish-x86_64.ko \ -  
517 $(LINUX_DIR)/arch/x86/crypto/twofish-x86_64-3way.ko \ -  
518 $(LINUX_DIR)/arch/x86/crypto/serpent-sse2-x86_64.ko \ -  
519 $(LINUX_DIR)/arch/x86/crypto/camellia-aesni-avx-x86_64.ko \ -  
520 $(LINUX_DIR)/arch/x86/crypto/cast5-avx-x86_64.ko \ -  
521 $(LINUX_DIR)/arch/x86/crypto/cast6-avx-x86_64.ko \ -  
522 $(LINUX_DIR)/arch/x86/crypto/twofish-avx-x86_64.ko \ -  
523 $(LINUX_DIR)/arch/x86/crypto/serpent-avx-x86_64.ko \ -  
524 $(LINUX_DIR)/arch/x86/crypto/camellia-aesni-avx2.ko \ -  
525 $(LINUX_DIR)/arch/x86/crypto/serpent-avx2.ko \ -  
526 $(LINUX_DIR)/crypto/ablk_helper.ko@lt4.17 -  
527 AUTOLOAD+= $(call AutoLoad,10,camellia-x86_64 \ -  
528 camellia-aesni-avx-x86_64 camellia-aesni-avx2 cast5-avx-x86_64 \ -  
529 cast6-avx-x86_64 twofish-x86_64 twofish-x86_64-3way \ -  
530 twofish-avx-x86_64 blowfish-x86_64 serpent-avx-x86_64 serpent-avx2) -  
531 endef 482 endif
Line 532... Line 483...
532   483  
533 $(eval $(call KernelPackage,crypto-misc)) 484 $(eval $(call KernelPackage,crypto-misc))
Line 569... Line 520...
569 $(eval $(call KernelPackage,crypto-pcompress)) 520 $(eval $(call KernelPackage,crypto-pcompress))
Line 570... Line 521...
570   521  
571   522  
572 define KernelPackage/crypto-rsa 523 define KernelPackage/crypto-rsa
573 TITLE:=RSA algorithm 524 TITLE:=RSA algorithm
574 DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager +kmod-asn1-decoder 525 DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager
575 KCONFIG:= CONFIG_CRYPTO_RSA 526 KCONFIG:= CONFIG_CRYPTO_RSA
-   527 HIDDEN:=1
576 HIDDEN:=1 528 FILES:= \
577 FILES:= \ 529 $(LINUX_DIR)/lib/asn1_decoder.ko \
578 $(LINUX_DIR)/lib/mpi/mpi.ko \ 530 $(LINUX_DIR)/lib/mpi/mpi.ko \
579 $(LINUX_DIR)/crypto/akcipher.ko \ 531 $(LINUX_DIR)/crypto/akcipher.ko \
580 $(LINUX_DIR)/crypto/rsa_generic.ko 532 $(LINUX_DIR)/crypto/rsa_generic.ko