Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

crypto: aspeed - Remove cfb and ofb

Remove the unused CFB/OFB implementation.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

+1 -233
+1 -3
drivers/crypto/aspeed/Kconfig
··· 38 38 select CRYPTO_DES 39 39 select CRYPTO_ECB 40 40 select CRYPTO_CBC 41 - select CRYPTO_CFB 42 - select CRYPTO_OFB 43 41 select CRYPTO_CTR 44 42 help 45 43 Select here to enable Aspeed Hash & Crypto Engine (HACE) 46 44 crypto driver. 47 45 Supports AES/DES symmetric-key encryption and decryption 48 - with ECB/CBC/CFB/OFB/CTR options. 46 + with ECB/CBC/CTR options. 49 47 50 48 config CRYPTO_DEV_ASPEED_ACRY 51 49 bool "Enable Aspeed ACRY RSA Engine"
-230
drivers/crypto/aspeed/aspeed-hace-crypto.c
··· 473 473 HACE_CMD_TRIPLE_DES); 474 474 } 475 475 476 - static int aspeed_tdes_ofb_decrypt(struct skcipher_request *req) 477 - { 478 - return aspeed_des_crypt(req, HACE_CMD_DECRYPT | HACE_CMD_OFB | 479 - HACE_CMD_TRIPLE_DES); 480 - } 481 - 482 - static int aspeed_tdes_ofb_encrypt(struct skcipher_request *req) 483 - { 484 - return aspeed_des_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_OFB | 485 - HACE_CMD_TRIPLE_DES); 486 - } 487 - 488 - static int aspeed_tdes_cfb_decrypt(struct skcipher_request *req) 489 - { 490 - return aspeed_des_crypt(req, HACE_CMD_DECRYPT | HACE_CMD_CFB | 491 - HACE_CMD_TRIPLE_DES); 492 - } 493 - 494 - static int aspeed_tdes_cfb_encrypt(struct skcipher_request *req) 495 - { 496 - return aspeed_des_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_CFB | 497 - HACE_CMD_TRIPLE_DES); 498 - } 499 - 500 476 static int aspeed_tdes_cbc_decrypt(struct skcipher_request *req) 501 477 { 502 478 return aspeed_des_crypt(req, HACE_CMD_DECRYPT | HACE_CMD_CBC | ··· 506 530 static int aspeed_des_ctr_encrypt(struct skcipher_request *req) 507 531 { 508 532 return aspeed_des_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_CTR | 509 - HACE_CMD_SINGLE_DES); 510 - } 511 - 512 - static int aspeed_des_ofb_decrypt(struct skcipher_request *req) 513 - { 514 - return aspeed_des_crypt(req, HACE_CMD_DECRYPT | HACE_CMD_OFB | 515 - HACE_CMD_SINGLE_DES); 516 - } 517 - 518 - static int aspeed_des_ofb_encrypt(struct skcipher_request *req) 519 - { 520 - return aspeed_des_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_OFB | 521 - HACE_CMD_SINGLE_DES); 522 - } 523 - 524 - static int aspeed_des_cfb_decrypt(struct skcipher_request *req) 525 - { 526 - return aspeed_des_crypt(req, HACE_CMD_DECRYPT | HACE_CMD_CFB | 527 - HACE_CMD_SINGLE_DES); 528 - } 529 - 530 - static int aspeed_des_cfb_encrypt(struct skcipher_request *req) 531 - { 532 - return aspeed_des_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_CFB | 533 533 HACE_CMD_SINGLE_DES); 534 534 } 535 535 ··· 609 657 static int aspeed_aes_ctr_encrypt(struct skcipher_request *req) 610 658 { 611 659 return aspeed_aes_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_CTR); 612 - } 613 - 614 - static int aspeed_aes_ofb_decrypt(struct skcipher_request *req) 615 - { 616 - return aspeed_aes_crypt(req, HACE_CMD_DECRYPT | HACE_CMD_OFB); 617 - } 618 - 619 - static int aspeed_aes_ofb_encrypt(struct skcipher_request *req) 620 - { 621 - return aspeed_aes_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_OFB); 622 - } 623 - 624 - static int aspeed_aes_cfb_decrypt(struct skcipher_request *req) 625 - { 626 - return aspeed_aes_crypt(req, HACE_CMD_DECRYPT | HACE_CMD_CFB); 627 - } 628 - 629 - static int aspeed_aes_cfb_encrypt(struct skcipher_request *req) 630 - { 631 - return aspeed_aes_crypt(req, HACE_CMD_ENCRYPT | HACE_CMD_CFB); 632 660 } 633 661 634 662 static int aspeed_aes_cbc_decrypt(struct skcipher_request *req) ··· 724 792 }, 725 793 { 726 794 .alg.skcipher.base = { 727 - .ivsize = AES_BLOCK_SIZE, 728 - .min_keysize = AES_MIN_KEY_SIZE, 729 - .max_keysize = AES_MAX_KEY_SIZE, 730 - .setkey = aspeed_aes_setkey, 731 - .encrypt = aspeed_aes_cfb_encrypt, 732 - .decrypt = aspeed_aes_cfb_decrypt, 733 - .init = aspeed_crypto_cra_init, 734 - .exit = aspeed_crypto_cra_exit, 735 - .base = { 736 - .cra_name = "cfb(aes)", 737 - .cra_driver_name = "aspeed-cfb-aes", 738 - .cra_priority = 300, 739 - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | 740 - CRYPTO_ALG_ASYNC | 741 - CRYPTO_ALG_NEED_FALLBACK, 742 - .cra_blocksize = 1, 743 - .cra_ctxsize = sizeof(struct aspeed_cipher_ctx), 744 - .cra_alignmask = 0x0f, 745 - .cra_module = THIS_MODULE, 746 - } 747 - }, 748 - .alg.skcipher.op = { 749 - .do_one_request = aspeed_crypto_do_request, 750 - }, 751 - }, 752 - { 753 - .alg.skcipher.base = { 754 - .ivsize = AES_BLOCK_SIZE, 755 - .min_keysize = AES_MIN_KEY_SIZE, 756 - .max_keysize = AES_MAX_KEY_SIZE, 757 - .setkey = aspeed_aes_setkey, 758 - .encrypt = aspeed_aes_ofb_encrypt, 759 - .decrypt = aspeed_aes_ofb_decrypt, 760 - .init = aspeed_crypto_cra_init, 761 - .exit = aspeed_crypto_cra_exit, 762 - .base = { 763 - .cra_name = "ofb(aes)", 764 - .cra_driver_name = "aspeed-ofb-aes", 765 - .cra_priority = 300, 766 - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | 767 - CRYPTO_ALG_ASYNC | 768 - CRYPTO_ALG_NEED_FALLBACK, 769 - .cra_blocksize = 1, 770 - .cra_ctxsize = sizeof(struct aspeed_cipher_ctx), 771 - .cra_alignmask = 0x0f, 772 - .cra_module = THIS_MODULE, 773 - } 774 - }, 775 - .alg.skcipher.op = { 776 - .do_one_request = aspeed_crypto_do_request, 777 - }, 778 - }, 779 - { 780 - .alg.skcipher.base = { 781 795 .min_keysize = DES_KEY_SIZE, 782 796 .max_keysize = DES_KEY_SIZE, 783 797 .setkey = aspeed_des_setkey, ··· 777 899 }, 778 900 { 779 901 .alg.skcipher.base = { 780 - .ivsize = DES_BLOCK_SIZE, 781 - .min_keysize = DES_KEY_SIZE, 782 - .max_keysize = DES_KEY_SIZE, 783 - .setkey = aspeed_des_setkey, 784 - .encrypt = aspeed_des_cfb_encrypt, 785 - .decrypt = aspeed_des_cfb_decrypt, 786 - .init = aspeed_crypto_cra_init, 787 - .exit = aspeed_crypto_cra_exit, 788 - .base = { 789 - .cra_name = "cfb(des)", 790 - .cra_driver_name = "aspeed-cfb-des", 791 - .cra_priority = 300, 792 - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | 793 - CRYPTO_ALG_ASYNC | 794 - CRYPTO_ALG_NEED_FALLBACK, 795 - .cra_blocksize = DES_BLOCK_SIZE, 796 - .cra_ctxsize = sizeof(struct aspeed_cipher_ctx), 797 - .cra_alignmask = 0x0f, 798 - .cra_module = THIS_MODULE, 799 - } 800 - }, 801 - .alg.skcipher.op = { 802 - .do_one_request = aspeed_crypto_do_request, 803 - }, 804 - }, 805 - { 806 - .alg.skcipher.base = { 807 - .ivsize = DES_BLOCK_SIZE, 808 - .min_keysize = DES_KEY_SIZE, 809 - .max_keysize = DES_KEY_SIZE, 810 - .setkey = aspeed_des_setkey, 811 - .encrypt = aspeed_des_ofb_encrypt, 812 - .decrypt = aspeed_des_ofb_decrypt, 813 - .init = aspeed_crypto_cra_init, 814 - .exit = aspeed_crypto_cra_exit, 815 - .base = { 816 - .cra_name = "ofb(des)", 817 - .cra_driver_name = "aspeed-ofb-des", 818 - .cra_priority = 300, 819 - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | 820 - CRYPTO_ALG_ASYNC | 821 - CRYPTO_ALG_NEED_FALLBACK, 822 - .cra_blocksize = DES_BLOCK_SIZE, 823 - .cra_ctxsize = sizeof(struct aspeed_cipher_ctx), 824 - .cra_alignmask = 0x0f, 825 - .cra_module = THIS_MODULE, 826 - } 827 - }, 828 - .alg.skcipher.op = { 829 - .do_one_request = aspeed_crypto_do_request, 830 - }, 831 - }, 832 - { 833 - .alg.skcipher.base = { 834 902 .min_keysize = DES3_EDE_KEY_SIZE, 835 903 .max_keysize = DES3_EDE_KEY_SIZE, 836 904 .setkey = aspeed_des_setkey, ··· 814 990 .base = { 815 991 .cra_name = "cbc(des3_ede)", 816 992 .cra_driver_name = "aspeed-cbc-tdes", 817 - .cra_priority = 300, 818 - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | 819 - CRYPTO_ALG_ASYNC | 820 - CRYPTO_ALG_NEED_FALLBACK, 821 - .cra_blocksize = DES_BLOCK_SIZE, 822 - .cra_ctxsize = sizeof(struct aspeed_cipher_ctx), 823 - .cra_alignmask = 0x0f, 824 - .cra_module = THIS_MODULE, 825 - } 826 - }, 827 - .alg.skcipher.op = { 828 - .do_one_request = aspeed_crypto_do_request, 829 - }, 830 - }, 831 - { 832 - .alg.skcipher.base = { 833 - .ivsize = DES_BLOCK_SIZE, 834 - .min_keysize = DES3_EDE_KEY_SIZE, 835 - .max_keysize = DES3_EDE_KEY_SIZE, 836 - .setkey = aspeed_des_setkey, 837 - .encrypt = aspeed_tdes_cfb_encrypt, 838 - .decrypt = aspeed_tdes_cfb_decrypt, 839 - .init = aspeed_crypto_cra_init, 840 - .exit = aspeed_crypto_cra_exit, 841 - .base = { 842 - .cra_name = "cfb(des3_ede)", 843 - .cra_driver_name = "aspeed-cfb-tdes", 844 - .cra_priority = 300, 845 - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | 846 - CRYPTO_ALG_ASYNC | 847 - CRYPTO_ALG_NEED_FALLBACK, 848 - .cra_blocksize = DES_BLOCK_SIZE, 849 - .cra_ctxsize = sizeof(struct aspeed_cipher_ctx), 850 - .cra_alignmask = 0x0f, 851 - .cra_module = THIS_MODULE, 852 - } 853 - }, 854 - .alg.skcipher.op = { 855 - .do_one_request = aspeed_crypto_do_request, 856 - }, 857 - }, 858 - { 859 - .alg.skcipher.base = { 860 - .ivsize = DES_BLOCK_SIZE, 861 - .min_keysize = DES3_EDE_KEY_SIZE, 862 - .max_keysize = DES3_EDE_KEY_SIZE, 863 - .setkey = aspeed_des_setkey, 864 - .encrypt = aspeed_tdes_ofb_encrypt, 865 - .decrypt = aspeed_tdes_ofb_decrypt, 866 - .init = aspeed_crypto_cra_init, 867 - .exit = aspeed_crypto_cra_exit, 868 - .base = { 869 - .cra_name = "ofb(des3_ede)", 870 - .cra_driver_name = "aspeed-ofb-tdes", 871 993 .cra_priority = 300, 872 994 .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | 873 995 CRYPTO_ALG_ASYNC |