diff options
author | jsing <> | 2022-08-04 08:02:31 +0000 |
---|---|---|
committer | jsing <> | 2022-08-04 08:02:31 +0000 |
commit | 4d9ca9ef1719bc2ad376a775fd5ce5a587fcfbec (patch) | |
tree | 09a6ee4805ee6149c08ee021b020404aa47629d2 /src | |
parent | 073e3daa684190306051a3294bddd23ff542b26a (diff) | |
download | openbsd-4d9ca9ef1719bc2ad376a775fd5ce5a587fcfbec.tar.gz openbsd-4d9ca9ef1719bc2ad376a775fd5ce5a587fcfbec.tar.bz2 openbsd-4d9ca9ef1719bc2ad376a775fd5ce5a587fcfbec.zip |
Mop up EVP_CIPH_FLAG_FIPS usage.
LibreSSL does not do FIPS and nothing else sets or checks these.
ok tb@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/evp/e_aes.c | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c index 14b39dba7d..67b447320c 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.44 2022/08/04 08:00:11 jsing Exp $ */ | 1 | /* $OpenBSD: e_aes.c,v 1.45 2022/08/04 08:02:31 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 | * |
@@ -543,7 +543,7 @@ static const EVP_CIPHER aesni_128_cbc = { | |||
543 | .block_size = 16, | 543 | .block_size = 16, |
544 | .key_len = 128 / 8, | 544 | .key_len = 128 / 8, |
545 | .iv_len = 16, | 545 | .iv_len = 16, |
546 | .flags = EVP_CIPH_FLAG_FIPS|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, |
548 | .do_cipher = aesni_cbc_cipher, | 548 | .do_cipher = aesni_cbc_cipher, |
549 | .ctx_size = sizeof(EVP_AES_KEY), | 549 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -555,7 +555,7 @@ static const EVP_CIPHER aes_128_cbc = { | |||
555 | .block_size = 16, | 555 | .block_size = 16, |
556 | .key_len = 128 / 8, | 556 | .key_len = 128 / 8, |
557 | .iv_len = 16, | 557 | .iv_len = 16, |
558 | .flags = EVP_CIPH_FLAG_FIPS|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, |
560 | .do_cipher = aes_cbc_cipher, | 560 | .do_cipher = aes_cbc_cipher, |
561 | .ctx_size = sizeof(EVP_AES_KEY), | 561 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -577,7 +577,7 @@ static const EVP_CIPHER aesni_128_ecb = { | |||
577 | .block_size = 16, | 577 | .block_size = 16, |
578 | .key_len = 128 / 8, | 578 | .key_len = 128 / 8, |
579 | .iv_len = 0, | 579 | .iv_len = 0, |
580 | .flags = EVP_CIPH_FLAG_FIPS|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, |
582 | .do_cipher = aesni_ecb_cipher, | 582 | .do_cipher = aesni_ecb_cipher, |
583 | .ctx_size = sizeof(EVP_AES_KEY), | 583 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -589,7 +589,7 @@ static const EVP_CIPHER aes_128_ecb = { | |||
589 | .block_size = 16, | 589 | .block_size = 16, |
590 | .key_len = 128 / 8, | 590 | .key_len = 128 / 8, |
591 | .iv_len = 0, | 591 | .iv_len = 0, |
592 | .flags = EVP_CIPH_FLAG_FIPS|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, |
594 | .do_cipher = aes_ecb_cipher, | 594 | .do_cipher = aes_ecb_cipher, |
595 | .ctx_size = sizeof(EVP_AES_KEY), | 595 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -611,7 +611,7 @@ static const EVP_CIPHER aesni_128_ofb = { | |||
611 | .block_size = 1, | 611 | .block_size = 1, |
612 | .key_len = 128 / 8, | 612 | .key_len = 128 / 8, |
613 | .iv_len = 16, | 613 | .iv_len = 16, |
614 | .flags = EVP_CIPH_FLAG_FIPS|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, |
616 | .do_cipher = aes_ofb_cipher, | 616 | .do_cipher = aes_ofb_cipher, |
617 | .ctx_size = sizeof(EVP_AES_KEY), | 617 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -623,7 +623,7 @@ static const EVP_CIPHER aes_128_ofb = { | |||
623 | .block_size = 1, | 623 | .block_size = 1, |
624 | .key_len = 128 / 8, | 624 | .key_len = 128 / 8, |
625 | .iv_len = 16, | 625 | .iv_len = 16, |
626 | .flags = EVP_CIPH_FLAG_FIPS|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, |
628 | .do_cipher = aes_ofb_cipher, | 628 | .do_cipher = aes_ofb_cipher, |
629 | .ctx_size = sizeof(EVP_AES_KEY), | 629 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -645,7 +645,7 @@ static const EVP_CIPHER aesni_128_cfb = { | |||
645 | .block_size = 1, | 645 | .block_size = 1, |
646 | .key_len = 128 / 8, | 646 | .key_len = 128 / 8, |
647 | .iv_len = 16, | 647 | .iv_len = 16, |
648 | .flags = EVP_CIPH_FLAG_FIPS|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, |
650 | .do_cipher = aes_cfb_cipher, | 650 | .do_cipher = aes_cfb_cipher, |
651 | .ctx_size = sizeof(EVP_AES_KEY), | 651 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -657,7 +657,7 @@ static const EVP_CIPHER aes_128_cfb = { | |||
657 | .block_size = 1, | 657 | .block_size = 1, |
658 | .key_len = 128 / 8, | 658 | .key_len = 128 / 8, |
659 | .iv_len = 16, | 659 | .iv_len = 16, |
660 | .flags = EVP_CIPH_FLAG_FIPS|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, |
662 | .do_cipher = aes_cfb_cipher, | 662 | .do_cipher = aes_cfb_cipher, |
663 | .ctx_size = sizeof(EVP_AES_KEY), | 663 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -679,7 +679,7 @@ static const EVP_CIPHER aesni_128_cfb1 = { | |||
679 | .block_size = 1, | 679 | .block_size = 1, |
680 | .key_len = 128 / 8, | 680 | .key_len = 128 / 8, |
681 | .iv_len = 16, | 681 | .iv_len = 16, |
682 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 682 | .flags = EVP_CIPH_CFB_MODE, |
683 | .init = aesni_init_key, | 683 | .init = aesni_init_key, |
684 | .do_cipher = aes_cfb1_cipher, | 684 | .do_cipher = aes_cfb1_cipher, |
685 | .ctx_size = sizeof(EVP_AES_KEY), | 685 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -691,7 +691,7 @@ static const EVP_CIPHER aes_128_cfb1 = { | |||
691 | .block_size = 1, | 691 | .block_size = 1, |
692 | .key_len = 128 / 8, | 692 | .key_len = 128 / 8, |
693 | .iv_len = 16, | 693 | .iv_len = 16, |
694 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 694 | .flags = EVP_CIPH_CFB_MODE, |
695 | .init = aes_init_key, | 695 | .init = aes_init_key, |
696 | .do_cipher = aes_cfb1_cipher, | 696 | .do_cipher = aes_cfb1_cipher, |
697 | .ctx_size = sizeof(EVP_AES_KEY), | 697 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -713,7 +713,7 @@ static const EVP_CIPHER aesni_128_cfb8 = { | |||
713 | .block_size = 1, | 713 | .block_size = 1, |
714 | .key_len = 128 / 8, | 714 | .key_len = 128 / 8, |
715 | .iv_len = 16, | 715 | .iv_len = 16, |
716 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 716 | .flags = EVP_CIPH_CFB_MODE, |
717 | .init = aesni_init_key, | 717 | .init = aesni_init_key, |
718 | .do_cipher = aes_cfb8_cipher, | 718 | .do_cipher = aes_cfb8_cipher, |
719 | .ctx_size = sizeof(EVP_AES_KEY), | 719 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -725,7 +725,7 @@ static const EVP_CIPHER aes_128_cfb8 = { | |||
725 | .block_size = 1, | 725 | .block_size = 1, |
726 | .key_len = 128 / 8, | 726 | .key_len = 128 / 8, |
727 | .iv_len = 16, | 727 | .iv_len = 16, |
728 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 728 | .flags = EVP_CIPH_CFB_MODE, |
729 | .init = aes_init_key, | 729 | .init = aes_init_key, |
730 | .do_cipher = aes_cfb8_cipher, | 730 | .do_cipher = aes_cfb8_cipher, |
731 | .ctx_size = sizeof(EVP_AES_KEY), | 731 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -747,7 +747,7 @@ static const EVP_CIPHER aesni_128_ctr = { | |||
747 | .block_size = 1, | 747 | .block_size = 1, |
748 | .key_len = 128 / 8, | 748 | .key_len = 128 / 8, |
749 | .iv_len = 16, | 749 | .iv_len = 16, |
750 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, | 750 | .flags = EVP_CIPH_CTR_MODE, |
751 | .init = aesni_init_key, | 751 | .init = aesni_init_key, |
752 | .do_cipher = aes_ctr_cipher, | 752 | .do_cipher = aes_ctr_cipher, |
753 | .ctx_size = sizeof(EVP_AES_KEY), | 753 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -759,7 +759,7 @@ static const EVP_CIPHER aes_128_ctr = { | |||
759 | .block_size = 1, | 759 | .block_size = 1, |
760 | .key_len = 128 / 8, | 760 | .key_len = 128 / 8, |
761 | .iv_len = 16, | 761 | .iv_len = 16, |
762 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, | 762 | .flags = EVP_CIPH_CTR_MODE, |
763 | .init = aes_init_key, | 763 | .init = aes_init_key, |
764 | .do_cipher = aes_ctr_cipher, | 764 | .do_cipher = aes_ctr_cipher, |
765 | .ctx_size = sizeof(EVP_AES_KEY), | 765 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -782,7 +782,7 @@ static const EVP_CIPHER aesni_192_cbc = { | |||
782 | .block_size = 16, | 782 | .block_size = 16, |
783 | .key_len = 192 / 8, | 783 | .key_len = 192 / 8, |
784 | .iv_len = 16, | 784 | .iv_len = 16, |
785 | .flags = EVP_CIPH_FLAG_FIPS|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, |
787 | .do_cipher = aesni_cbc_cipher, | 787 | .do_cipher = aesni_cbc_cipher, |
788 | .ctx_size = sizeof(EVP_AES_KEY), | 788 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -794,7 +794,7 @@ static const EVP_CIPHER aes_192_cbc = { | |||
794 | .block_size = 16, | 794 | .block_size = 16, |
795 | .key_len = 192 / 8, | 795 | .key_len = 192 / 8, |
796 | .iv_len = 16, | 796 | .iv_len = 16, |
797 | .flags = EVP_CIPH_FLAG_FIPS|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, |
799 | .do_cipher = aes_cbc_cipher, | 799 | .do_cipher = aes_cbc_cipher, |
800 | .ctx_size = sizeof(EVP_AES_KEY), | 800 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -816,7 +816,7 @@ static const EVP_CIPHER aesni_192_ecb = { | |||
816 | .block_size = 16, | 816 | .block_size = 16, |
817 | .key_len = 192 / 8, | 817 | .key_len = 192 / 8, |
818 | .iv_len = 0, | 818 | .iv_len = 0, |
819 | .flags = EVP_CIPH_FLAG_FIPS|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, |
821 | .do_cipher = aesni_ecb_cipher, | 821 | .do_cipher = aesni_ecb_cipher, |
822 | .ctx_size = sizeof(EVP_AES_KEY), | 822 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -828,7 +828,7 @@ static const EVP_CIPHER aes_192_ecb = { | |||
828 | .block_size = 16, | 828 | .block_size = 16, |
829 | .key_len = 192 / 8, | 829 | .key_len = 192 / 8, |
830 | .iv_len = 0, | 830 | .iv_len = 0, |
831 | .flags = EVP_CIPH_FLAG_FIPS|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, |
833 | .do_cipher = aes_ecb_cipher, | 833 | .do_cipher = aes_ecb_cipher, |
834 | .ctx_size = sizeof(EVP_AES_KEY), | 834 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -850,7 +850,7 @@ static const EVP_CIPHER aesni_192_ofb = { | |||
850 | .block_size = 1, | 850 | .block_size = 1, |
851 | .key_len = 192 / 8, | 851 | .key_len = 192 / 8, |
852 | .iv_len = 16, | 852 | .iv_len = 16, |
853 | .flags = EVP_CIPH_FLAG_FIPS|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, |
855 | .do_cipher = aes_ofb_cipher, | 855 | .do_cipher = aes_ofb_cipher, |
856 | .ctx_size = sizeof(EVP_AES_KEY), | 856 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -862,7 +862,7 @@ static const EVP_CIPHER aes_192_ofb = { | |||
862 | .block_size = 1, | 862 | .block_size = 1, |
863 | .key_len = 192 / 8, | 863 | .key_len = 192 / 8, |
864 | .iv_len = 16, | 864 | .iv_len = 16, |
865 | .flags = EVP_CIPH_FLAG_FIPS|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, |
867 | .do_cipher = aes_ofb_cipher, | 867 | .do_cipher = aes_ofb_cipher, |
868 | .ctx_size = sizeof(EVP_AES_KEY), | 868 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -884,7 +884,7 @@ static const EVP_CIPHER aesni_192_cfb = { | |||
884 | .block_size = 1, | 884 | .block_size = 1, |
885 | .key_len = 192 / 8, | 885 | .key_len = 192 / 8, |
886 | .iv_len = 16, | 886 | .iv_len = 16, |
887 | .flags = EVP_CIPH_FLAG_FIPS|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, |
889 | .do_cipher = aes_cfb_cipher, | 889 | .do_cipher = aes_cfb_cipher, |
890 | .ctx_size = sizeof(EVP_AES_KEY), | 890 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -896,7 +896,7 @@ static const EVP_CIPHER aes_192_cfb = { | |||
896 | .block_size = 1, | 896 | .block_size = 1, |
897 | .key_len = 192 / 8, | 897 | .key_len = 192 / 8, |
898 | .iv_len = 16, | 898 | .iv_len = 16, |
899 | .flags = EVP_CIPH_FLAG_FIPS|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, |
901 | .do_cipher = aes_cfb_cipher, | 901 | .do_cipher = aes_cfb_cipher, |
902 | .ctx_size = sizeof(EVP_AES_KEY), | 902 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -918,7 +918,7 @@ static const EVP_CIPHER aesni_192_cfb1 = { | |||
918 | .block_size = 1, | 918 | .block_size = 1, |
919 | .key_len = 192 / 8, | 919 | .key_len = 192 / 8, |
920 | .iv_len = 16, | 920 | .iv_len = 16, |
921 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 921 | .flags = EVP_CIPH_CFB_MODE, |
922 | .init = aesni_init_key, | 922 | .init = aesni_init_key, |
923 | .do_cipher = aes_cfb1_cipher, | 923 | .do_cipher = aes_cfb1_cipher, |
924 | .ctx_size = sizeof(EVP_AES_KEY), | 924 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -930,7 +930,7 @@ static const EVP_CIPHER aes_192_cfb1 = { | |||
930 | .block_size = 1, | 930 | .block_size = 1, |
931 | .key_len = 192 / 8, | 931 | .key_len = 192 / 8, |
932 | .iv_len = 16, | 932 | .iv_len = 16, |
933 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 933 | .flags = EVP_CIPH_CFB_MODE, |
934 | .init = aes_init_key, | 934 | .init = aes_init_key, |
935 | .do_cipher = aes_cfb1_cipher, | 935 | .do_cipher = aes_cfb1_cipher, |
936 | .ctx_size = sizeof(EVP_AES_KEY), | 936 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -952,7 +952,7 @@ static const EVP_CIPHER aesni_192_cfb8 = { | |||
952 | .block_size = 1, | 952 | .block_size = 1, |
953 | .key_len = 192 / 8, | 953 | .key_len = 192 / 8, |
954 | .iv_len = 16, | 954 | .iv_len = 16, |
955 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 955 | .flags = EVP_CIPH_CFB_MODE, |
956 | .init = aesni_init_key, | 956 | .init = aesni_init_key, |
957 | .do_cipher = aes_cfb8_cipher, | 957 | .do_cipher = aes_cfb8_cipher, |
958 | .ctx_size = sizeof(EVP_AES_KEY), | 958 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -964,7 +964,7 @@ static const EVP_CIPHER aes_192_cfb8 = { | |||
964 | .block_size = 1, | 964 | .block_size = 1, |
965 | .key_len = 192 / 8, | 965 | .key_len = 192 / 8, |
966 | .iv_len = 16, | 966 | .iv_len = 16, |
967 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 967 | .flags = EVP_CIPH_CFB_MODE, |
968 | .init = aes_init_key, | 968 | .init = aes_init_key, |
969 | .do_cipher = aes_cfb8_cipher, | 969 | .do_cipher = aes_cfb8_cipher, |
970 | .ctx_size = sizeof(EVP_AES_KEY), | 970 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -986,7 +986,7 @@ static const EVP_CIPHER aesni_192_ctr = { | |||
986 | .block_size = 1, | 986 | .block_size = 1, |
987 | .key_len = 192 / 8, | 987 | .key_len = 192 / 8, |
988 | .iv_len = 16, | 988 | .iv_len = 16, |
989 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, | 989 | .flags = EVP_CIPH_CTR_MODE, |
990 | .init = aesni_init_key, | 990 | .init = aesni_init_key, |
991 | .do_cipher = aes_ctr_cipher, | 991 | .do_cipher = aes_ctr_cipher, |
992 | .ctx_size = sizeof(EVP_AES_KEY), | 992 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -998,7 +998,7 @@ static const EVP_CIPHER aes_192_ctr = { | |||
998 | .block_size = 1, | 998 | .block_size = 1, |
999 | .key_len = 192 / 8, | 999 | .key_len = 192 / 8, |
1000 | .iv_len = 16, | 1000 | .iv_len = 16, |
1001 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, | 1001 | .flags = EVP_CIPH_CTR_MODE, |
1002 | .init = aes_init_key, | 1002 | .init = aes_init_key, |
1003 | .do_cipher = aes_ctr_cipher, | 1003 | .do_cipher = aes_ctr_cipher, |
1004 | .ctx_size = sizeof(EVP_AES_KEY), | 1004 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1021,7 +1021,7 @@ static const EVP_CIPHER aesni_256_cbc = { | |||
1021 | .block_size = 16, | 1021 | .block_size = 16, |
1022 | .key_len = 256 / 8, | 1022 | .key_len = 256 / 8, |
1023 | .iv_len = 16, | 1023 | .iv_len = 16, |
1024 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1026 | .do_cipher = aesni_cbc_cipher, | 1026 | .do_cipher = aesni_cbc_cipher, |
1027 | .ctx_size = sizeof(EVP_AES_KEY), | 1027 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1033,7 +1033,7 @@ static const EVP_CIPHER aes_256_cbc = { | |||
1033 | .block_size = 16, | 1033 | .block_size = 16, |
1034 | .key_len = 256 / 8, | 1034 | .key_len = 256 / 8, |
1035 | .iv_len = 16, | 1035 | .iv_len = 16, |
1036 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1038 | .do_cipher = aes_cbc_cipher, | 1038 | .do_cipher = aes_cbc_cipher, |
1039 | .ctx_size = sizeof(EVP_AES_KEY), | 1039 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1055,7 +1055,7 @@ static const EVP_CIPHER aesni_256_ecb = { | |||
1055 | .block_size = 16, | 1055 | .block_size = 16, |
1056 | .key_len = 256 / 8, | 1056 | .key_len = 256 / 8, |
1057 | .iv_len = 0, | 1057 | .iv_len = 0, |
1058 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1060 | .do_cipher = aesni_ecb_cipher, | 1060 | .do_cipher = aesni_ecb_cipher, |
1061 | .ctx_size = sizeof(EVP_AES_KEY), | 1061 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1067,7 +1067,7 @@ static const EVP_CIPHER aes_256_ecb = { | |||
1067 | .block_size = 16, | 1067 | .block_size = 16, |
1068 | .key_len = 256 / 8, | 1068 | .key_len = 256 / 8, |
1069 | .iv_len = 0, | 1069 | .iv_len = 0, |
1070 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1072 | .do_cipher = aes_ecb_cipher, | 1072 | .do_cipher = aes_ecb_cipher, |
1073 | .ctx_size = sizeof(EVP_AES_KEY), | 1073 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1089,7 +1089,7 @@ static const EVP_CIPHER aesni_256_ofb = { | |||
1089 | .block_size = 1, | 1089 | .block_size = 1, |
1090 | .key_len = 256 / 8, | 1090 | .key_len = 256 / 8, |
1091 | .iv_len = 16, | 1091 | .iv_len = 16, |
1092 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1094 | .do_cipher = aes_ofb_cipher, | 1094 | .do_cipher = aes_ofb_cipher, |
1095 | .ctx_size = sizeof(EVP_AES_KEY), | 1095 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1101,7 +1101,7 @@ static const EVP_CIPHER aes_256_ofb = { | |||
1101 | .block_size = 1, | 1101 | .block_size = 1, |
1102 | .key_len = 256 / 8, | 1102 | .key_len = 256 / 8, |
1103 | .iv_len = 16, | 1103 | .iv_len = 16, |
1104 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1106 | .do_cipher = aes_ofb_cipher, | 1106 | .do_cipher = aes_ofb_cipher, |
1107 | .ctx_size = sizeof(EVP_AES_KEY), | 1107 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1123,7 +1123,7 @@ static const EVP_CIPHER aesni_256_cfb = { | |||
1123 | .block_size = 1, | 1123 | .block_size = 1, |
1124 | .key_len = 256 / 8, | 1124 | .key_len = 256 / 8, |
1125 | .iv_len = 16, | 1125 | .iv_len = 16, |
1126 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1128 | .do_cipher = aes_cfb_cipher, | 1128 | .do_cipher = aes_cfb_cipher, |
1129 | .ctx_size = sizeof(EVP_AES_KEY), | 1129 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1135,7 +1135,7 @@ static const EVP_CIPHER aes_256_cfb = { | |||
1135 | .block_size = 1, | 1135 | .block_size = 1, |
1136 | .key_len = 256 / 8, | 1136 | .key_len = 256 / 8, |
1137 | .iv_len = 16, | 1137 | .iv_len = 16, |
1138 | .flags = EVP_CIPH_FLAG_FIPS|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, |
1140 | .do_cipher = aes_cfb_cipher, | 1140 | .do_cipher = aes_cfb_cipher, |
1141 | .ctx_size = sizeof(EVP_AES_KEY), | 1141 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1157,7 +1157,7 @@ static const EVP_CIPHER aesni_256_cfb1 = { | |||
1157 | .block_size = 1, | 1157 | .block_size = 1, |
1158 | .key_len = 256 / 8, | 1158 | .key_len = 256 / 8, |
1159 | .iv_len = 16, | 1159 | .iv_len = 16, |
1160 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 1160 | .flags = EVP_CIPH_CFB_MODE, |
1161 | .init = aesni_init_key, | 1161 | .init = aesni_init_key, |
1162 | .do_cipher = aes_cfb1_cipher, | 1162 | .do_cipher = aes_cfb1_cipher, |
1163 | .ctx_size = sizeof(EVP_AES_KEY), | 1163 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1169,7 +1169,7 @@ static const EVP_CIPHER aes_256_cfb1 = { | |||
1169 | .block_size = 1, | 1169 | .block_size = 1, |
1170 | .key_len = 256 / 8, | 1170 | .key_len = 256 / 8, |
1171 | .iv_len = 16, | 1171 | .iv_len = 16, |
1172 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 1172 | .flags = EVP_CIPH_CFB_MODE, |
1173 | .init = aes_init_key, | 1173 | .init = aes_init_key, |
1174 | .do_cipher = aes_cfb1_cipher, | 1174 | .do_cipher = aes_cfb1_cipher, |
1175 | .ctx_size = sizeof(EVP_AES_KEY), | 1175 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1191,7 +1191,7 @@ static const EVP_CIPHER aesni_256_cfb8 = { | |||
1191 | .block_size = 1, | 1191 | .block_size = 1, |
1192 | .key_len = 256 / 8, | 1192 | .key_len = 256 / 8, |
1193 | .iv_len = 16, | 1193 | .iv_len = 16, |
1194 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 1194 | .flags = EVP_CIPH_CFB_MODE, |
1195 | .init = aesni_init_key, | 1195 | .init = aesni_init_key, |
1196 | .do_cipher = aes_cfb8_cipher, | 1196 | .do_cipher = aes_cfb8_cipher, |
1197 | .ctx_size = sizeof(EVP_AES_KEY), | 1197 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1203,7 +1203,7 @@ static const EVP_CIPHER aes_256_cfb8 = { | |||
1203 | .block_size = 1, | 1203 | .block_size = 1, |
1204 | .key_len = 256 / 8, | 1204 | .key_len = 256 / 8, |
1205 | .iv_len = 16, | 1205 | .iv_len = 16, |
1206 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, | 1206 | .flags = EVP_CIPH_CFB_MODE, |
1207 | .init = aes_init_key, | 1207 | .init = aes_init_key, |
1208 | .do_cipher = aes_cfb8_cipher, | 1208 | .do_cipher = aes_cfb8_cipher, |
1209 | .ctx_size = sizeof(EVP_AES_KEY), | 1209 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1225,7 +1225,7 @@ static const EVP_CIPHER aesni_256_ctr = { | |||
1225 | .block_size = 1, | 1225 | .block_size = 1, |
1226 | .key_len = 256 / 8, | 1226 | .key_len = 256 / 8, |
1227 | .iv_len = 16, | 1227 | .iv_len = 16, |
1228 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, | 1228 | .flags = EVP_CIPH_CTR_MODE, |
1229 | .init = aesni_init_key, | 1229 | .init = aesni_init_key, |
1230 | .do_cipher = aes_ctr_cipher, | 1230 | .do_cipher = aes_ctr_cipher, |
1231 | .ctx_size = sizeof(EVP_AES_KEY), | 1231 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1237,7 +1237,7 @@ static const EVP_CIPHER aes_256_ctr = { | |||
1237 | .block_size = 1, | 1237 | .block_size = 1, |
1238 | .key_len = 256 / 8, | 1238 | .key_len = 256 / 8, |
1239 | .iv_len = 16, | 1239 | .iv_len = 16, |
1240 | .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, | 1240 | .flags = EVP_CIPH_CTR_MODE, |
1241 | .init = aes_init_key, | 1241 | .init = aes_init_key, |
1242 | .do_cipher = aes_ctr_cipher, | 1242 | .do_cipher = aes_ctr_cipher, |
1243 | .ctx_size = sizeof(EVP_AES_KEY), | 1243 | .ctx_size = sizeof(EVP_AES_KEY), |
@@ -1639,7 +1639,7 @@ static const EVP_CIPHER aesni_128_gcm = { | |||
1639 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1639 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1640 | 128 / 8, | 1640 | 128 / 8, |
1641 | .iv_len = 12, | 1641 | .iv_len = 12, |
1642 | .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, | 1642 | .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, |
1643 | .init = aesni_gcm_init_key, | 1643 | .init = aesni_gcm_init_key, |
1644 | .do_cipher = aes_gcm_cipher, | 1644 | .do_cipher = aes_gcm_cipher, |
1645 | .cleanup = aes_gcm_cleanup, | 1645 | .cleanup = aes_gcm_cleanup, |
@@ -1655,7 +1655,7 @@ static const EVP_CIPHER aes_128_gcm = { | |||
1655 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1655 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1656 | 128 / 8, | 1656 | 128 / 8, |
1657 | .iv_len = 12, | 1657 | .iv_len = 12, |
1658 | .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, | 1658 | .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, |
1659 | .init = aes_gcm_init_key, | 1659 | .init = aes_gcm_init_key, |
1660 | .do_cipher = aes_gcm_cipher, | 1660 | .do_cipher = aes_gcm_cipher, |
1661 | .cleanup = aes_gcm_cleanup, | 1661 | .cleanup = aes_gcm_cleanup, |
@@ -1681,7 +1681,7 @@ static const EVP_CIPHER aesni_192_gcm = { | |||
1681 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1681 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1682 | 192 / 8, | 1682 | 192 / 8, |
1683 | .iv_len = 12, | 1683 | .iv_len = 12, |
1684 | .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, | 1684 | .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, |
1685 | .init = aesni_gcm_init_key, | 1685 | .init = aesni_gcm_init_key, |
1686 | .do_cipher = aes_gcm_cipher, | 1686 | .do_cipher = aes_gcm_cipher, |
1687 | .cleanup = aes_gcm_cleanup, | 1687 | .cleanup = aes_gcm_cleanup, |
@@ -1697,7 +1697,7 @@ static const EVP_CIPHER aes_192_gcm = { | |||
1697 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1697 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1698 | 192 / 8, | 1698 | 192 / 8, |
1699 | .iv_len = 12, | 1699 | .iv_len = 12, |
1700 | .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, | 1700 | .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, |
1701 | .init = aes_gcm_init_key, | 1701 | .init = aes_gcm_init_key, |
1702 | .do_cipher = aes_gcm_cipher, | 1702 | .do_cipher = aes_gcm_cipher, |
1703 | .cleanup = aes_gcm_cleanup, | 1703 | .cleanup = aes_gcm_cleanup, |
@@ -1723,7 +1723,7 @@ static const EVP_CIPHER aesni_256_gcm = { | |||
1723 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1723 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1724 | 256 / 8, | 1724 | 256 / 8, |
1725 | .iv_len = 12, | 1725 | .iv_len = 12, |
1726 | .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, | 1726 | .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, |
1727 | .init = aesni_gcm_init_key, | 1727 | .init = aesni_gcm_init_key, |
1728 | .do_cipher = aes_gcm_cipher, | 1728 | .do_cipher = aes_gcm_cipher, |
1729 | .cleanup = aes_gcm_cleanup, | 1729 | .cleanup = aes_gcm_cleanup, |
@@ -1739,7 +1739,7 @@ static const EVP_CIPHER aes_256_gcm = { | |||
1739 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1739 | (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1740 | 256 / 8, | 1740 | 256 / 8, |
1741 | .iv_len = 12, | 1741 | .iv_len = 12, |
1742 | .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, | 1742 | .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, |
1743 | .init = aes_gcm_init_key, | 1743 | .init = aes_gcm_init_key, |
1744 | .do_cipher = aes_gcm_cipher, | 1744 | .do_cipher = aes_gcm_cipher, |
1745 | .cleanup = aes_gcm_cleanup, | 1745 | .cleanup = aes_gcm_cleanup, |
@@ -1895,7 +1895,7 @@ static const EVP_CIPHER aesni_128_xts = { | |||
1895 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1895 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1896 | 128 / 8, | 1896 | 128 / 8, |
1897 | .iv_len = 16, | 1897 | .iv_len = 16, |
1898 | .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, | 1898 | .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, |
1899 | .init = aesni_xts_init_key, | 1899 | .init = aesni_xts_init_key, |
1900 | .do_cipher = aes_xts_cipher, | 1900 | .do_cipher = aes_xts_cipher, |
1901 | .cleanup = aes_xts_cleanup, | 1901 | .cleanup = aes_xts_cleanup, |
@@ -1911,7 +1911,7 @@ static const EVP_CIPHER aes_128_xts = { | |||
1911 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1911 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1912 | 128 / 8, | 1912 | 128 / 8, |
1913 | .iv_len = 16, | 1913 | .iv_len = 16, |
1914 | .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, | 1914 | .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, |
1915 | .init = aes_xts_init_key, | 1915 | .init = aes_xts_init_key, |
1916 | .do_cipher = aes_xts_cipher, | 1916 | .do_cipher = aes_xts_cipher, |
1917 | .cleanup = aes_xts_cleanup, | 1917 | .cleanup = aes_xts_cleanup, |
@@ -1937,7 +1937,7 @@ static const EVP_CIPHER aesni_256_xts = { | |||
1937 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1937 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1938 | 256 / 8, | 1938 | 256 / 8, |
1939 | .iv_len = 16, | 1939 | .iv_len = 16, |
1940 | .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, | 1940 | .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, |
1941 | .init = aesni_xts_init_key, | 1941 | .init = aesni_xts_init_key, |
1942 | .do_cipher = aes_xts_cipher, | 1942 | .do_cipher = aes_xts_cipher, |
1943 | .cleanup = aes_xts_cleanup, | 1943 | .cleanup = aes_xts_cleanup, |
@@ -1953,7 +1953,7 @@ static const EVP_CIPHER aes_256_xts = { | |||
1953 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 1953 | (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
1954 | 256 / 8, | 1954 | 256 / 8, |
1955 | .iv_len = 16, | 1955 | .iv_len = 16, |
1956 | .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, | 1956 | .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, |
1957 | .init = aes_xts_init_key, | 1957 | .init = aes_xts_init_key, |
1958 | .do_cipher = aes_xts_cipher, | 1958 | .do_cipher = aes_xts_cipher, |
1959 | .cleanup = aes_xts_cleanup, | 1959 | .cleanup = aes_xts_cleanup, |
@@ -2140,7 +2140,7 @@ static const EVP_CIPHER aesni_128_ccm = { | |||
2140 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 2140 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
2141 | 128 / 8, | 2141 | 128 / 8, |
2142 | .iv_len = 12, | 2142 | .iv_len = 12, |
2143 | .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, | 2143 | .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, |
2144 | .init = aesni_ccm_init_key, | 2144 | .init = aesni_ccm_init_key, |
2145 | .do_cipher = aes_ccm_cipher, | 2145 | .do_cipher = aes_ccm_cipher, |
2146 | .cleanup = aes_ccm_cleanup, | 2146 | .cleanup = aes_ccm_cleanup, |
@@ -2156,7 +2156,7 @@ static const EVP_CIPHER aes_128_ccm = { | |||
2156 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 2156 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
2157 | 128 / 8, | 2157 | 128 / 8, |
2158 | .iv_len = 12, | 2158 | .iv_len = 12, |
2159 | .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, | 2159 | .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, |
2160 | .init = aes_ccm_init_key, | 2160 | .init = aes_ccm_init_key, |
2161 | .do_cipher = aes_ccm_cipher, | 2161 | .do_cipher = aes_ccm_cipher, |
2162 | .cleanup = aes_ccm_cleanup, | 2162 | .cleanup = aes_ccm_cleanup, |
@@ -2182,7 +2182,7 @@ static const EVP_CIPHER aesni_192_ccm = { | |||
2182 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 2182 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
2183 | 192 / 8, | 2183 | 192 / 8, |
2184 | .iv_len = 12, | 2184 | .iv_len = 12, |
2185 | .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, | 2185 | .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, |
2186 | .init = aesni_ccm_init_key, | 2186 | .init = aesni_ccm_init_key, |
2187 | .do_cipher = aes_ccm_cipher, | 2187 | .do_cipher = aes_ccm_cipher, |
2188 | .cleanup = aes_ccm_cleanup, | 2188 | .cleanup = aes_ccm_cleanup, |
@@ -2198,7 +2198,7 @@ static const EVP_CIPHER aes_192_ccm = { | |||
2198 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 2198 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
2199 | 192 / 8, | 2199 | 192 / 8, |
2200 | .iv_len = 12, | 2200 | .iv_len = 12, |
2201 | .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, | 2201 | .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, |
2202 | .init = aes_ccm_init_key, | 2202 | .init = aes_ccm_init_key, |
2203 | .do_cipher = aes_ccm_cipher, | 2203 | .do_cipher = aes_ccm_cipher, |
2204 | .cleanup = aes_ccm_cleanup, | 2204 | .cleanup = aes_ccm_cleanup, |
@@ -2224,7 +2224,7 @@ static const EVP_CIPHER aesni_256_ccm = { | |||
2224 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 2224 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
2225 | 256 / 8, | 2225 | 256 / 8, |
2226 | .iv_len = 12, | 2226 | .iv_len = 12, |
2227 | .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, | 2227 | .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, |
2228 | .init = aesni_ccm_init_key, | 2228 | .init = aesni_ccm_init_key, |
2229 | .do_cipher = aes_ccm_cipher, | 2229 | .do_cipher = aes_ccm_cipher, |
2230 | .cleanup = aes_ccm_cleanup, | 2230 | .cleanup = aes_ccm_cleanup, |
@@ -2240,7 +2240,7 @@ static const EVP_CIPHER aes_256_ccm = { | |||
2240 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * | 2240 | (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * |
2241 | 256 / 8, | 2241 | 256 / 8, |
2242 | .iv_len = 12, | 2242 | .iv_len = 12, |
2243 | .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, | 2243 | .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, |
2244 | .init = aes_ccm_init_key, | 2244 | .init = aes_ccm_init_key, |
2245 | .do_cipher = aes_ccm_cipher, | 2245 | .do_cipher = aes_ccm_cipher, |
2246 | .cleanup = aes_ccm_cleanup, | 2246 | .cleanup = aes_ccm_cleanup, |