summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2022-08-04 08:06:48 +0000
committerjsing <>2022-08-04 08:06:48 +0000
commit28e3b1222b3ca2332b57eabdb44e9133d6907f97 (patch)
treed6b0e79641f394fbb5e0b61e053c6a09553fc5c7 /src
parent4d9ca9ef1719bc2ad376a775fd5ce5a587fcfbec (diff)
downloadopenbsd-28e3b1222b3ca2332b57eabdb44e9133d6907f97.tar.gz
openbsd-28e3b1222b3ca2332b57eabdb44e9133d6907f97.tar.bz2
openbsd-28e3b1222b3ca2332b57eabdb44e9133d6907f97.zip
Mop up key_len assignments.
Remove unnecessary conditions for XTS mode, since we know which are XTS. Also use bytes rather than bits / 8. ok tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/evp/e_aes.c150
1 files changed, 59 insertions, 91 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 67b447320c..65dd18f477 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_aes.c,v 1.45 2022/08/04 08:02:31 jsing Exp $ */ 1/* $OpenBSD: e_aes.c,v 1.46 2022/08/04 08:06:48 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -541,7 +541,7 @@ aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
541static const EVP_CIPHER aesni_128_cbc = { 541static const EVP_CIPHER aesni_128_cbc = {
542 .nid = NID_aes_128_cbc, 542 .nid = NID_aes_128_cbc,
543 .block_size = 16, 543 .block_size = 16,
544 .key_len = 128 / 8, 544 .key_len = 16,
545 .iv_len = 16, 545 .iv_len = 16,
546 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, 546 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE,
547 .init = aesni_init_key, 547 .init = aesni_init_key,
@@ -553,7 +553,7 @@ static const EVP_CIPHER aesni_128_cbc = {
553static const EVP_CIPHER aes_128_cbc = { 553static const EVP_CIPHER aes_128_cbc = {
554 .nid = NID_aes_128_cbc, 554 .nid = NID_aes_128_cbc,
555 .block_size = 16, 555 .block_size = 16,
556 .key_len = 128 / 8, 556 .key_len = 16,
557 .iv_len = 16, 557 .iv_len = 16,
558 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, 558 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE,
559 .init = aes_init_key, 559 .init = aes_init_key,
@@ -575,7 +575,7 @@ EVP_aes_128_cbc(void)
575static const EVP_CIPHER aesni_128_ecb = { 575static const EVP_CIPHER aesni_128_ecb = {
576 .nid = NID_aes_128_ecb, 576 .nid = NID_aes_128_ecb,
577 .block_size = 16, 577 .block_size = 16,
578 .key_len = 128 / 8, 578 .key_len = 16,
579 .iv_len = 0, 579 .iv_len = 0,
580 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, 580 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE,
581 .init = aesni_init_key, 581 .init = aesni_init_key,
@@ -587,7 +587,7 @@ static const EVP_CIPHER aesni_128_ecb = {
587static const EVP_CIPHER aes_128_ecb = { 587static const EVP_CIPHER aes_128_ecb = {
588 .nid = NID_aes_128_ecb, 588 .nid = NID_aes_128_ecb,
589 .block_size = 16, 589 .block_size = 16,
590 .key_len = 128 / 8, 590 .key_len = 16,
591 .iv_len = 0, 591 .iv_len = 0,
592 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, 592 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE,
593 .init = aes_init_key, 593 .init = aes_init_key,
@@ -609,7 +609,7 @@ EVP_aes_128_ecb(void)
609static const EVP_CIPHER aesni_128_ofb = { 609static const EVP_CIPHER aesni_128_ofb = {
610 .nid = NID_aes_128_ofb128, 610 .nid = NID_aes_128_ofb128,
611 .block_size = 1, 611 .block_size = 1,
612 .key_len = 128 / 8, 612 .key_len = 16,
613 .iv_len = 16, 613 .iv_len = 16,
614 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, 614 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
615 .init = aesni_init_key, 615 .init = aesni_init_key,
@@ -621,7 +621,7 @@ static const EVP_CIPHER aesni_128_ofb = {
621static const EVP_CIPHER aes_128_ofb = { 621static const EVP_CIPHER aes_128_ofb = {
622 .nid = NID_aes_128_ofb128, 622 .nid = NID_aes_128_ofb128,
623 .block_size = 1, 623 .block_size = 1,
624 .key_len = 128 / 8, 624 .key_len = 16,
625 .iv_len = 16, 625 .iv_len = 16,
626 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, 626 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
627 .init = aes_init_key, 627 .init = aes_init_key,
@@ -643,7 +643,7 @@ EVP_aes_128_ofb(void)
643static const EVP_CIPHER aesni_128_cfb = { 643static const EVP_CIPHER aesni_128_cfb = {
644 .nid = NID_aes_128_cfb128, 644 .nid = NID_aes_128_cfb128,
645 .block_size = 1, 645 .block_size = 1,
646 .key_len = 128 / 8, 646 .key_len = 16,
647 .iv_len = 16, 647 .iv_len = 16,
648 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, 648 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE,
649 .init = aesni_init_key, 649 .init = aesni_init_key,
@@ -655,7 +655,7 @@ static const EVP_CIPHER aesni_128_cfb = {
655static const EVP_CIPHER aes_128_cfb = { 655static const EVP_CIPHER aes_128_cfb = {
656 .nid = NID_aes_128_cfb128, 656 .nid = NID_aes_128_cfb128,
657 .block_size = 1, 657 .block_size = 1,
658 .key_len = 128 / 8, 658 .key_len = 16,
659 .iv_len = 16, 659 .iv_len = 16,
660 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, 660 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE,
661 .init = aes_init_key, 661 .init = aes_init_key,
@@ -677,7 +677,7 @@ EVP_aes_128_cfb(void)
677static const EVP_CIPHER aesni_128_cfb1 = { 677static const EVP_CIPHER aesni_128_cfb1 = {
678 .nid = NID_aes_128_cfb1, 678 .nid = NID_aes_128_cfb1,
679 .block_size = 1, 679 .block_size = 1,
680 .key_len = 128 / 8, 680 .key_len = 16,
681 .iv_len = 16, 681 .iv_len = 16,
682 .flags = EVP_CIPH_CFB_MODE, 682 .flags = EVP_CIPH_CFB_MODE,
683 .init = aesni_init_key, 683 .init = aesni_init_key,
@@ -689,7 +689,7 @@ static const EVP_CIPHER aesni_128_cfb1 = {
689static const EVP_CIPHER aes_128_cfb1 = { 689static const EVP_CIPHER aes_128_cfb1 = {
690 .nid = NID_aes_128_cfb1, 690 .nid = NID_aes_128_cfb1,
691 .block_size = 1, 691 .block_size = 1,
692 .key_len = 128 / 8, 692 .key_len = 16,
693 .iv_len = 16, 693 .iv_len = 16,
694 .flags = EVP_CIPH_CFB_MODE, 694 .flags = EVP_CIPH_CFB_MODE,
695 .init = aes_init_key, 695 .init = aes_init_key,
@@ -711,7 +711,7 @@ EVP_aes_128_cfb1(void)
711static const EVP_CIPHER aesni_128_cfb8 = { 711static const EVP_CIPHER aesni_128_cfb8 = {
712 .nid = NID_aes_128_cfb8, 712 .nid = NID_aes_128_cfb8,
713 .block_size = 1, 713 .block_size = 1,
714 .key_len = 128 / 8, 714 .key_len = 16,
715 .iv_len = 16, 715 .iv_len = 16,
716 .flags = EVP_CIPH_CFB_MODE, 716 .flags = EVP_CIPH_CFB_MODE,
717 .init = aesni_init_key, 717 .init = aesni_init_key,
@@ -723,7 +723,7 @@ static const EVP_CIPHER aesni_128_cfb8 = {
723static const EVP_CIPHER aes_128_cfb8 = { 723static const EVP_CIPHER aes_128_cfb8 = {
724 .nid = NID_aes_128_cfb8, 724 .nid = NID_aes_128_cfb8,
725 .block_size = 1, 725 .block_size = 1,
726 .key_len = 128 / 8, 726 .key_len = 16,
727 .iv_len = 16, 727 .iv_len = 16,
728 .flags = EVP_CIPH_CFB_MODE, 728 .flags = EVP_CIPH_CFB_MODE,
729 .init = aes_init_key, 729 .init = aes_init_key,
@@ -745,7 +745,7 @@ EVP_aes_128_cfb8(void)
745static const EVP_CIPHER aesni_128_ctr = { 745static const EVP_CIPHER aesni_128_ctr = {
746 .nid = NID_aes_128_ctr, 746 .nid = NID_aes_128_ctr,
747 .block_size = 1, 747 .block_size = 1,
748 .key_len = 128 / 8, 748 .key_len = 16,
749 .iv_len = 16, 749 .iv_len = 16,
750 .flags = EVP_CIPH_CTR_MODE, 750 .flags = EVP_CIPH_CTR_MODE,
751 .init = aesni_init_key, 751 .init = aesni_init_key,
@@ -757,7 +757,7 @@ static const EVP_CIPHER aesni_128_ctr = {
757static const EVP_CIPHER aes_128_ctr = { 757static const EVP_CIPHER aes_128_ctr = {
758 .nid = NID_aes_128_ctr, 758 .nid = NID_aes_128_ctr,
759 .block_size = 1, 759 .block_size = 1,
760 .key_len = 128 / 8, 760 .key_len = 16,
761 .iv_len = 16, 761 .iv_len = 16,
762 .flags = EVP_CIPH_CTR_MODE, 762 .flags = EVP_CIPH_CTR_MODE,
763 .init = aes_init_key, 763 .init = aes_init_key,
@@ -780,7 +780,7 @@ EVP_aes_128_ctr(void)
780static const EVP_CIPHER aesni_192_cbc = { 780static const EVP_CIPHER aesni_192_cbc = {
781 .nid = NID_aes_192_cbc, 781 .nid = NID_aes_192_cbc,
782 .block_size = 16, 782 .block_size = 16,
783 .key_len = 192 / 8, 783 .key_len = 24,
784 .iv_len = 16, 784 .iv_len = 16,
785 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, 785 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE,
786 .init = aesni_init_key, 786 .init = aesni_init_key,
@@ -792,7 +792,7 @@ static const EVP_CIPHER aesni_192_cbc = {
792static const EVP_CIPHER aes_192_cbc = { 792static const EVP_CIPHER aes_192_cbc = {
793 .nid = NID_aes_192_cbc, 793 .nid = NID_aes_192_cbc,
794 .block_size = 16, 794 .block_size = 16,
795 .key_len = 192 / 8, 795 .key_len = 24,
796 .iv_len = 16, 796 .iv_len = 16,
797 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, 797 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE,
798 .init = aes_init_key, 798 .init = aes_init_key,
@@ -814,7 +814,7 @@ EVP_aes_192_cbc(void)
814static const EVP_CIPHER aesni_192_ecb = { 814static const EVP_CIPHER aesni_192_ecb = {
815 .nid = NID_aes_192_ecb, 815 .nid = NID_aes_192_ecb,
816 .block_size = 16, 816 .block_size = 16,
817 .key_len = 192 / 8, 817 .key_len = 24,
818 .iv_len = 0, 818 .iv_len = 0,
819 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, 819 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE,
820 .init = aesni_init_key, 820 .init = aesni_init_key,
@@ -826,7 +826,7 @@ static const EVP_CIPHER aesni_192_ecb = {
826static const EVP_CIPHER aes_192_ecb = { 826static const EVP_CIPHER aes_192_ecb = {
827 .nid = NID_aes_192_ecb, 827 .nid = NID_aes_192_ecb,
828 .block_size = 16, 828 .block_size = 16,
829 .key_len = 192 / 8, 829 .key_len = 24,
830 .iv_len = 0, 830 .iv_len = 0,
831 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, 831 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE,
832 .init = aes_init_key, 832 .init = aes_init_key,
@@ -848,7 +848,7 @@ EVP_aes_192_ecb(void)
848static const EVP_CIPHER aesni_192_ofb = { 848static const EVP_CIPHER aesni_192_ofb = {
849 .nid = NID_aes_192_ofb128, 849 .nid = NID_aes_192_ofb128,
850 .block_size = 1, 850 .block_size = 1,
851 .key_len = 192 / 8, 851 .key_len = 24,
852 .iv_len = 16, 852 .iv_len = 16,
853 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, 853 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
854 .init = aesni_init_key, 854 .init = aesni_init_key,
@@ -860,7 +860,7 @@ static const EVP_CIPHER aesni_192_ofb = {
860static const EVP_CIPHER aes_192_ofb = { 860static const EVP_CIPHER aes_192_ofb = {
861 .nid = NID_aes_192_ofb128, 861 .nid = NID_aes_192_ofb128,
862 .block_size = 1, 862 .block_size = 1,
863 .key_len = 192 / 8, 863 .key_len = 24,
864 .iv_len = 16, 864 .iv_len = 16,
865 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, 865 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
866 .init = aes_init_key, 866 .init = aes_init_key,
@@ -882,7 +882,7 @@ EVP_aes_192_ofb(void)
882static const EVP_CIPHER aesni_192_cfb = { 882static const EVP_CIPHER aesni_192_cfb = {
883 .nid = NID_aes_192_cfb128, 883 .nid = NID_aes_192_cfb128,
884 .block_size = 1, 884 .block_size = 1,
885 .key_len = 192 / 8, 885 .key_len = 24,
886 .iv_len = 16, 886 .iv_len = 16,
887 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, 887 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE,
888 .init = aesni_init_key, 888 .init = aesni_init_key,
@@ -894,7 +894,7 @@ static const EVP_CIPHER aesni_192_cfb = {
894static const EVP_CIPHER aes_192_cfb = { 894static const EVP_CIPHER aes_192_cfb = {
895 .nid = NID_aes_192_cfb128, 895 .nid = NID_aes_192_cfb128,
896 .block_size = 1, 896 .block_size = 1,
897 .key_len = 192 / 8, 897 .key_len = 24,
898 .iv_len = 16, 898 .iv_len = 16,
899 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, 899 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE,
900 .init = aes_init_key, 900 .init = aes_init_key,
@@ -916,7 +916,7 @@ EVP_aes_192_cfb(void)
916static const EVP_CIPHER aesni_192_cfb1 = { 916static const EVP_CIPHER aesni_192_cfb1 = {
917 .nid = NID_aes_192_cfb1, 917 .nid = NID_aes_192_cfb1,
918 .block_size = 1, 918 .block_size = 1,
919 .key_len = 192 / 8, 919 .key_len = 24,
920 .iv_len = 16, 920 .iv_len = 16,
921 .flags = EVP_CIPH_CFB_MODE, 921 .flags = EVP_CIPH_CFB_MODE,
922 .init = aesni_init_key, 922 .init = aesni_init_key,
@@ -928,7 +928,7 @@ static const EVP_CIPHER aesni_192_cfb1 = {
928static const EVP_CIPHER aes_192_cfb1 = { 928static const EVP_CIPHER aes_192_cfb1 = {
929 .nid = NID_aes_192_cfb1, 929 .nid = NID_aes_192_cfb1,
930 .block_size = 1, 930 .block_size = 1,
931 .key_len = 192 / 8, 931 .key_len = 24,
932 .iv_len = 16, 932 .iv_len = 16,
933 .flags = EVP_CIPH_CFB_MODE, 933 .flags = EVP_CIPH_CFB_MODE,
934 .init = aes_init_key, 934 .init = aes_init_key,
@@ -950,7 +950,7 @@ EVP_aes_192_cfb1(void)
950static const EVP_CIPHER aesni_192_cfb8 = { 950static const EVP_CIPHER aesni_192_cfb8 = {
951 .nid = NID_aes_192_cfb8, 951 .nid = NID_aes_192_cfb8,
952 .block_size = 1, 952 .block_size = 1,
953 .key_len = 192 / 8, 953 .key_len = 24,
954 .iv_len = 16, 954 .iv_len = 16,
955 .flags = EVP_CIPH_CFB_MODE, 955 .flags = EVP_CIPH_CFB_MODE,
956 .init = aesni_init_key, 956 .init = aesni_init_key,
@@ -962,7 +962,7 @@ static const EVP_CIPHER aesni_192_cfb8 = {
962static const EVP_CIPHER aes_192_cfb8 = { 962static const EVP_CIPHER aes_192_cfb8 = {
963 .nid = NID_aes_192_cfb8, 963 .nid = NID_aes_192_cfb8,
964 .block_size = 1, 964 .block_size = 1,
965 .key_len = 192 / 8, 965 .key_len = 24,
966 .iv_len = 16, 966 .iv_len = 16,
967 .flags = EVP_CIPH_CFB_MODE, 967 .flags = EVP_CIPH_CFB_MODE,
968 .init = aes_init_key, 968 .init = aes_init_key,
@@ -984,7 +984,7 @@ EVP_aes_192_cfb8(void)
984static const EVP_CIPHER aesni_192_ctr = { 984static const EVP_CIPHER aesni_192_ctr = {
985 .nid = NID_aes_192_ctr, 985 .nid = NID_aes_192_ctr,
986 .block_size = 1, 986 .block_size = 1,
987 .key_len = 192 / 8, 987 .key_len = 24,
988 .iv_len = 16, 988 .iv_len = 16,
989 .flags = EVP_CIPH_CTR_MODE, 989 .flags = EVP_CIPH_CTR_MODE,
990 .init = aesni_init_key, 990 .init = aesni_init_key,
@@ -996,7 +996,7 @@ static const EVP_CIPHER aesni_192_ctr = {
996static const EVP_CIPHER aes_192_ctr = { 996static const EVP_CIPHER aes_192_ctr = {
997 .nid = NID_aes_192_ctr, 997 .nid = NID_aes_192_ctr,
998 .block_size = 1, 998 .block_size = 1,
999 .key_len = 192 / 8, 999 .key_len = 24,
1000 .iv_len = 16, 1000 .iv_len = 16,
1001 .flags = EVP_CIPH_CTR_MODE, 1001 .flags = EVP_CIPH_CTR_MODE,
1002 .init = aes_init_key, 1002 .init = aes_init_key,
@@ -1019,7 +1019,7 @@ EVP_aes_192_ctr(void)
1019static const EVP_CIPHER aesni_256_cbc = { 1019static const EVP_CIPHER aesni_256_cbc = {
1020 .nid = NID_aes_256_cbc, 1020 .nid = NID_aes_256_cbc,
1021 .block_size = 16, 1021 .block_size = 16,
1022 .key_len = 256 / 8, 1022 .key_len = 32,
1023 .iv_len = 16, 1023 .iv_len = 16,
1024 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, 1024 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE,
1025 .init = aesni_init_key, 1025 .init = aesni_init_key,
@@ -1031,7 +1031,7 @@ static const EVP_CIPHER aesni_256_cbc = {
1031static const EVP_CIPHER aes_256_cbc = { 1031static const EVP_CIPHER aes_256_cbc = {
1032 .nid = NID_aes_256_cbc, 1032 .nid = NID_aes_256_cbc,
1033 .block_size = 16, 1033 .block_size = 16,
1034 .key_len = 256 / 8, 1034 .key_len = 32,
1035 .iv_len = 16, 1035 .iv_len = 16,
1036 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, 1036 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE,
1037 .init = aes_init_key, 1037 .init = aes_init_key,
@@ -1053,7 +1053,7 @@ EVP_aes_256_cbc(void)
1053static const EVP_CIPHER aesni_256_ecb = { 1053static const EVP_CIPHER aesni_256_ecb = {
1054 .nid = NID_aes_256_ecb, 1054 .nid = NID_aes_256_ecb,
1055 .block_size = 16, 1055 .block_size = 16,
1056 .key_len = 256 / 8, 1056 .key_len = 32,
1057 .iv_len = 0, 1057 .iv_len = 0,
1058 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, 1058 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE,
1059 .init = aesni_init_key, 1059 .init = aesni_init_key,
@@ -1065,7 +1065,7 @@ static const EVP_CIPHER aesni_256_ecb = {
1065static const EVP_CIPHER aes_256_ecb = { 1065static const EVP_CIPHER aes_256_ecb = {
1066 .nid = NID_aes_256_ecb, 1066 .nid = NID_aes_256_ecb,
1067 .block_size = 16, 1067 .block_size = 16,
1068 .key_len = 256 / 8, 1068 .key_len = 32,
1069 .iv_len = 0, 1069 .iv_len = 0,
1070 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, 1070 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE,
1071 .init = aes_init_key, 1071 .init = aes_init_key,
@@ -1087,7 +1087,7 @@ EVP_aes_256_ecb(void)
1087static const EVP_CIPHER aesni_256_ofb = { 1087static const EVP_CIPHER aesni_256_ofb = {
1088 .nid = NID_aes_256_ofb128, 1088 .nid = NID_aes_256_ofb128,
1089 .block_size = 1, 1089 .block_size = 1,
1090 .key_len = 256 / 8, 1090 .key_len = 32,
1091 .iv_len = 16, 1091 .iv_len = 16,
1092 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, 1092 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
1093 .init = aesni_init_key, 1093 .init = aesni_init_key,
@@ -1099,7 +1099,7 @@ static const EVP_CIPHER aesni_256_ofb = {
1099static const EVP_CIPHER aes_256_ofb = { 1099static const EVP_CIPHER aes_256_ofb = {
1100 .nid = NID_aes_256_ofb128, 1100 .nid = NID_aes_256_ofb128,
1101 .block_size = 1, 1101 .block_size = 1,
1102 .key_len = 256 / 8, 1102 .key_len = 32,
1103 .iv_len = 16, 1103 .iv_len = 16,
1104 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, 1104 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
1105 .init = aes_init_key, 1105 .init = aes_init_key,
@@ -1121,7 +1121,7 @@ EVP_aes_256_ofb(void)
1121static const EVP_CIPHER aesni_256_cfb = { 1121static const EVP_CIPHER aesni_256_cfb = {
1122 .nid = NID_aes_256_cfb128, 1122 .nid = NID_aes_256_cfb128,
1123 .block_size = 1, 1123 .block_size = 1,
1124 .key_len = 256 / 8, 1124 .key_len = 32,
1125 .iv_len = 16, 1125 .iv_len = 16,
1126 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, 1126 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE,
1127 .init = aesni_init_key, 1127 .init = aesni_init_key,
@@ -1133,7 +1133,7 @@ static const EVP_CIPHER aesni_256_cfb = {
1133static const EVP_CIPHER aes_256_cfb = { 1133static const EVP_CIPHER aes_256_cfb = {
1134 .nid = NID_aes_256_cfb128, 1134 .nid = NID_aes_256_cfb128,
1135 .block_size = 1, 1135 .block_size = 1,
1136 .key_len = 256 / 8, 1136 .key_len = 32,
1137 .iv_len = 16, 1137 .iv_len = 16,
1138 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, 1138 .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE,
1139 .init = aes_init_key, 1139 .init = aes_init_key,
@@ -1155,7 +1155,7 @@ EVP_aes_256_cfb(void)
1155static const EVP_CIPHER aesni_256_cfb1 = { 1155static const EVP_CIPHER aesni_256_cfb1 = {
1156 .nid = NID_aes_256_cfb1, 1156 .nid = NID_aes_256_cfb1,
1157 .block_size = 1, 1157 .block_size = 1,
1158 .key_len = 256 / 8, 1158 .key_len = 32,
1159 .iv_len = 16, 1159 .iv_len = 16,
1160 .flags = EVP_CIPH_CFB_MODE, 1160 .flags = EVP_CIPH_CFB_MODE,
1161 .init = aesni_init_key, 1161 .init = aesni_init_key,
@@ -1167,7 +1167,7 @@ static const EVP_CIPHER aesni_256_cfb1 = {
1167static const EVP_CIPHER aes_256_cfb1 = { 1167static const EVP_CIPHER aes_256_cfb1 = {
1168 .nid = NID_aes_256_cfb1, 1168 .nid = NID_aes_256_cfb1,
1169 .block_size = 1, 1169 .block_size = 1,
1170 .key_len = 256 / 8, 1170 .key_len = 32,
1171 .iv_len = 16, 1171 .iv_len = 16,
1172 .flags = EVP_CIPH_CFB_MODE, 1172 .flags = EVP_CIPH_CFB_MODE,
1173 .init = aes_init_key, 1173 .init = aes_init_key,
@@ -1189,7 +1189,7 @@ EVP_aes_256_cfb1(void)
1189static const EVP_CIPHER aesni_256_cfb8 = { 1189static const EVP_CIPHER aesni_256_cfb8 = {
1190 .nid = NID_aes_256_cfb8, 1190 .nid = NID_aes_256_cfb8,
1191 .block_size = 1, 1191 .block_size = 1,
1192 .key_len = 256 / 8, 1192 .key_len = 32,
1193 .iv_len = 16, 1193 .iv_len = 16,
1194 .flags = EVP_CIPH_CFB_MODE, 1194 .flags = EVP_CIPH_CFB_MODE,
1195 .init = aesni_init_key, 1195 .init = aesni_init_key,
@@ -1201,7 +1201,7 @@ static const EVP_CIPHER aesni_256_cfb8 = {
1201static const EVP_CIPHER aes_256_cfb8 = { 1201static const EVP_CIPHER aes_256_cfb8 = {
1202 .nid = NID_aes_256_cfb8, 1202 .nid = NID_aes_256_cfb8,
1203 .block_size = 1, 1203 .block_size = 1,
1204 .key_len = 256 / 8, 1204 .key_len = 32,
1205 .iv_len = 16, 1205 .iv_len = 16,
1206 .flags = EVP_CIPH_CFB_MODE, 1206 .flags = EVP_CIPH_CFB_MODE,
1207 .init = aes_init_key, 1207 .init = aes_init_key,
@@ -1223,7 +1223,7 @@ EVP_aes_256_cfb8(void)
1223static const EVP_CIPHER aesni_256_ctr = { 1223static const EVP_CIPHER aesni_256_ctr = {
1224 .nid = NID_aes_256_ctr, 1224 .nid = NID_aes_256_ctr,
1225 .block_size = 1, 1225 .block_size = 1,
1226 .key_len = 256 / 8, 1226 .key_len = 32,
1227 .iv_len = 16, 1227 .iv_len = 16,
1228 .flags = EVP_CIPH_CTR_MODE, 1228 .flags = EVP_CIPH_CTR_MODE,
1229 .init = aesni_init_key, 1229 .init = aesni_init_key,
@@ -1235,7 +1235,7 @@ static const EVP_CIPHER aesni_256_ctr = {
1235static const EVP_CIPHER aes_256_ctr = { 1235static const EVP_CIPHER aes_256_ctr = {
1236 .nid = NID_aes_256_ctr, 1236 .nid = NID_aes_256_ctr,
1237 .block_size = 1, 1237 .block_size = 1,
1238 .key_len = 256 / 8, 1238 .key_len = 32,
1239 .iv_len = 16, 1239 .iv_len = 16,
1240 .flags = EVP_CIPH_CTR_MODE, 1240 .flags = EVP_CIPH_CTR_MODE,
1241 .init = aes_init_key, 1241 .init = aes_init_key,
@@ -1635,9 +1635,7 @@ aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
1635static const EVP_CIPHER aesni_128_gcm = { 1635static const EVP_CIPHER aesni_128_gcm = {
1636 .nid = NID_aes_128_gcm, 1636 .nid = NID_aes_128_gcm,
1637 .block_size = 1, 1637 .block_size = 1,
1638 .key_len = 1638 .key_len = 16,
1639 (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1640 128 / 8,
1641 .iv_len = 12, 1639 .iv_len = 12,
1642 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, 1640 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE,
1643 .init = aesni_gcm_init_key, 1641 .init = aesni_gcm_init_key,
@@ -1651,9 +1649,7 @@ static const EVP_CIPHER aesni_128_gcm = {
1651static const EVP_CIPHER aes_128_gcm = { 1649static const EVP_CIPHER aes_128_gcm = {
1652 .nid = NID_aes_128_gcm, 1650 .nid = NID_aes_128_gcm,
1653 .block_size = 1, 1651 .block_size = 1,
1654 .key_len = 1652 .key_len = 16,
1655 (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1656 128 / 8,
1657 .iv_len = 12, 1653 .iv_len = 12,
1658 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, 1654 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE,
1659 .init = aes_gcm_init_key, 1655 .init = aes_gcm_init_key,
@@ -1677,9 +1673,7 @@ EVP_aes_128_gcm(void)
1677static const EVP_CIPHER aesni_192_gcm = { 1673static const EVP_CIPHER aesni_192_gcm = {
1678 .nid = NID_aes_192_gcm, 1674 .nid = NID_aes_192_gcm,
1679 .block_size = 1, 1675 .block_size = 1,
1680 .key_len = 1676 .key_len = 24,
1681 (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1682 192 / 8,
1683 .iv_len = 12, 1677 .iv_len = 12,
1684 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, 1678 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE,
1685 .init = aesni_gcm_init_key, 1679 .init = aesni_gcm_init_key,
@@ -1693,9 +1687,7 @@ static const EVP_CIPHER aesni_192_gcm = {
1693static const EVP_CIPHER aes_192_gcm = { 1687static const EVP_CIPHER aes_192_gcm = {
1694 .nid = NID_aes_192_gcm, 1688 .nid = NID_aes_192_gcm,
1695 .block_size = 1, 1689 .block_size = 1,
1696 .key_len = 1690 .key_len = 24,
1697 (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1698 192 / 8,
1699 .iv_len = 12, 1691 .iv_len = 12,
1700 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, 1692 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE,
1701 .init = aes_gcm_init_key, 1693 .init = aes_gcm_init_key,
@@ -1719,9 +1711,7 @@ EVP_aes_192_gcm(void)
1719static const EVP_CIPHER aesni_256_gcm = { 1711static const EVP_CIPHER aesni_256_gcm = {
1720 .nid = NID_aes_256_gcm, 1712 .nid = NID_aes_256_gcm,
1721 .block_size = 1, 1713 .block_size = 1,
1722 .key_len = 1714 .key_len = 32,
1723 (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1724 256 / 8,
1725 .iv_len = 12, 1715 .iv_len = 12,
1726 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, 1716 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE,
1727 .init = aesni_gcm_init_key, 1717 .init = aesni_gcm_init_key,
@@ -1735,9 +1725,7 @@ static const EVP_CIPHER aesni_256_gcm = {
1735static const EVP_CIPHER aes_256_gcm = { 1725static const EVP_CIPHER aes_256_gcm = {
1736 .nid = NID_aes_256_gcm, 1726 .nid = NID_aes_256_gcm,
1737 .block_size = 1, 1727 .block_size = 1,
1738 .key_len = 1728 .key_len = 32,
1739 (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1740 256 / 8,
1741 .iv_len = 12, 1729 .iv_len = 12,
1742 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, 1730 .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE,
1743 .init = aes_gcm_init_key, 1731 .init = aes_gcm_init_key,
@@ -1891,9 +1879,7 @@ aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
1891static const EVP_CIPHER aesni_128_xts = { 1879static const EVP_CIPHER aesni_128_xts = {
1892 .nid = NID_aes_128_xts, 1880 .nid = NID_aes_128_xts,
1893 .block_size = 1, 1881 .block_size = 1,
1894 .key_len = 1882 .key_len = 2 * 16,
1895 (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1896 128 / 8,
1897 .iv_len = 16, 1883 .iv_len = 16,
1898 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, 1884 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE,
1899 .init = aesni_xts_init_key, 1885 .init = aesni_xts_init_key,
@@ -1907,9 +1893,7 @@ static const EVP_CIPHER aesni_128_xts = {
1907static const EVP_CIPHER aes_128_xts = { 1893static const EVP_CIPHER aes_128_xts = {
1908 .nid = NID_aes_128_xts, 1894 .nid = NID_aes_128_xts,
1909 .block_size = 1, 1895 .block_size = 1,
1910 .key_len = 1896 .key_len = 2 * 16,
1911 (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1912 128 / 8,
1913 .iv_len = 16, 1897 .iv_len = 16,
1914 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, 1898 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE,
1915 .init = aes_xts_init_key, 1899 .init = aes_xts_init_key,
@@ -1933,9 +1917,7 @@ EVP_aes_128_xts(void)
1933static const EVP_CIPHER aesni_256_xts = { 1917static const EVP_CIPHER aesni_256_xts = {
1934 .nid = NID_aes_256_xts, 1918 .nid = NID_aes_256_xts,
1935 .block_size = 1, 1919 .block_size = 1,
1936 .key_len = 1920 .key_len = 2 * 32,
1937 (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1938 256 / 8,
1939 .iv_len = 16, 1921 .iv_len = 16,
1940 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, 1922 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE,
1941 .init = aesni_xts_init_key, 1923 .init = aesni_xts_init_key,
@@ -1949,9 +1931,7 @@ static const EVP_CIPHER aesni_256_xts = {
1949static const EVP_CIPHER aes_256_xts = { 1931static const EVP_CIPHER aes_256_xts = {
1950 .nid = NID_aes_256_xts, 1932 .nid = NID_aes_256_xts,
1951 .block_size = 1, 1933 .block_size = 1,
1952 .key_len = 1934 .key_len = 2 * 32,
1953 (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
1954 256 / 8,
1955 .iv_len = 16, 1935 .iv_len = 16,
1956 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, 1936 .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE,
1957 .init = aes_xts_init_key, 1937 .init = aes_xts_init_key,
@@ -2136,9 +2116,7 @@ aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
2136static const EVP_CIPHER aesni_128_ccm = { 2116static const EVP_CIPHER aesni_128_ccm = {
2137 .nid = NID_aes_128_ccm, 2117 .nid = NID_aes_128_ccm,
2138 .block_size = 1, 2118 .block_size = 1,
2139 .key_len = 2119 .key_len = 16,
2140 (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
2141 128 / 8,
2142 .iv_len = 12, 2120 .iv_len = 12,
2143 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, 2121 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE,
2144 .init = aesni_ccm_init_key, 2122 .init = aesni_ccm_init_key,
@@ -2152,9 +2130,7 @@ static const EVP_CIPHER aesni_128_ccm = {
2152static const EVP_CIPHER aes_128_ccm = { 2130static const EVP_CIPHER aes_128_ccm = {
2153 .nid = NID_aes_128_ccm, 2131 .nid = NID_aes_128_ccm,
2154 .block_size = 1, 2132 .block_size = 1,
2155 .key_len = 2133 .key_len = 16,
2156 (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
2157 128 / 8,
2158 .iv_len = 12, 2134 .iv_len = 12,
2159 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, 2135 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE,
2160 .init = aes_ccm_init_key, 2136 .init = aes_ccm_init_key,
@@ -2178,9 +2154,7 @@ EVP_aes_128_ccm(void)
2178static const EVP_CIPHER aesni_192_ccm = { 2154static const EVP_CIPHER aesni_192_ccm = {
2179 .nid = NID_aes_192_ccm, 2155 .nid = NID_aes_192_ccm,
2180 .block_size = 1, 2156 .block_size = 1,
2181 .key_len = 2157 .key_len = 24,
2182 (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
2183 192 / 8,
2184 .iv_len = 12, 2158 .iv_len = 12,
2185 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, 2159 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE,
2186 .init = aesni_ccm_init_key, 2160 .init = aesni_ccm_init_key,
@@ -2194,9 +2168,7 @@ static const EVP_CIPHER aesni_192_ccm = {
2194static const EVP_CIPHER aes_192_ccm = { 2168static const EVP_CIPHER aes_192_ccm = {
2195 .nid = NID_aes_192_ccm, 2169 .nid = NID_aes_192_ccm,
2196 .block_size = 1, 2170 .block_size = 1,
2197 .key_len = 2171 .key_len = 24,
2198 (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
2199 192 / 8,
2200 .iv_len = 12, 2172 .iv_len = 12,
2201 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, 2173 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE,
2202 .init = aes_ccm_init_key, 2174 .init = aes_ccm_init_key,
@@ -2220,9 +2192,7 @@ EVP_aes_192_ccm(void)
2220static const EVP_CIPHER aesni_256_ccm = { 2192static const EVP_CIPHER aesni_256_ccm = {
2221 .nid = NID_aes_256_ccm, 2193 .nid = NID_aes_256_ccm,
2222 .block_size = 1, 2194 .block_size = 1,
2223 .key_len = 2195 .key_len = 32,
2224 (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
2225 256 / 8,
2226 .iv_len = 12, 2196 .iv_len = 12,
2227 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, 2197 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE,
2228 .init = aesni_ccm_init_key, 2198 .init = aesni_ccm_init_key,
@@ -2236,9 +2206,7 @@ static const EVP_CIPHER aesni_256_ccm = {
2236static const EVP_CIPHER aes_256_ccm = { 2206static const EVP_CIPHER aes_256_ccm = {
2237 .nid = NID_aes_256_ccm, 2207 .nid = NID_aes_256_ccm,
2238 .block_size = 1, 2208 .block_size = 1,
2239 .key_len = 2209 .key_len = 32,
2240 (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) *
2241 256 / 8,
2242 .iv_len = 12, 2210 .iv_len = 12,
2243 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, 2211 .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE,
2244 .init = aes_ccm_init_key, 2212 .init = aes_ccm_init_key,
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 16:18:42 +0000