diff options
-rw-r--r-- | src/lib/libssl/s3_lib.c | 168 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/s3_lib.c | 168 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_ciph.c | 9 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_locl.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 9 | ||||
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 3 |
6 files changed, 172 insertions, 188 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 261bd2d4f6..e1c18bd10d 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.63 2014/07/08 21:31:54 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.64 2014/07/08 21:50:40 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -196,7 +196,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
196 | .algorithm_enc = SSL_eNULL, | 196 | .algorithm_enc = SSL_eNULL, |
197 | .algorithm_mac = SSL_SHA1, | 197 | .algorithm_mac = SSL_SHA1, |
198 | .algorithm_ssl = SSL_SSLV3, | 198 | .algorithm_ssl = SSL_SSLV3, |
199 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 199 | .algo_strength = SSL_STRONG_NONE, |
200 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 200 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
201 | .strength_bits = 0, | 201 | .strength_bits = 0, |
202 | .alg_bits = 0, | 202 | .alg_bits = 0, |
@@ -326,7 +326,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
326 | .algorithm_enc = SSL_3DES, | 326 | .algorithm_enc = SSL_3DES, |
327 | .algorithm_mac = SSL_SHA1, | 327 | .algorithm_mac = SSL_SHA1, |
328 | .algorithm_ssl = SSL_SSLV3, | 328 | .algorithm_ssl = SSL_SSLV3, |
329 | .algo_strength = SSL_HIGH|SSL_FIPS, | 329 | .algo_strength = SSL_HIGH, |
330 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 330 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
331 | .strength_bits = 112, | 331 | .strength_bits = 112, |
332 | .alg_bits = 168, | 332 | .alg_bits = 168, |
@@ -375,7 +375,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
375 | .algorithm_enc = SSL_3DES, | 375 | .algorithm_enc = SSL_3DES, |
376 | .algorithm_mac = SSL_SHA1, | 376 | .algorithm_mac = SSL_SHA1, |
377 | .algorithm_ssl = SSL_SSLV3, | 377 | .algorithm_ssl = SSL_SSLV3, |
378 | .algo_strength = SSL_HIGH|SSL_FIPS, | 378 | .algo_strength = SSL_HIGH, |
379 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 379 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
380 | .strength_bits = 112, | 380 | .strength_bits = 112, |
381 | .alg_bits = 168, | 381 | .alg_bits = 168, |
@@ -423,7 +423,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
423 | .algorithm_enc = SSL_3DES, | 423 | .algorithm_enc = SSL_3DES, |
424 | .algorithm_mac = SSL_SHA1, | 424 | .algorithm_mac = SSL_SHA1, |
425 | .algorithm_ssl = SSL_SSLV3, | 425 | .algorithm_ssl = SSL_SSLV3, |
426 | .algo_strength = SSL_HIGH|SSL_FIPS, | 426 | .algo_strength = SSL_HIGH, |
427 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 427 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
428 | .strength_bits = 112, | 428 | .strength_bits = 112, |
429 | .alg_bits = 168, | 429 | .alg_bits = 168, |
@@ -472,7 +472,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
472 | .algorithm_enc = SSL_3DES, | 472 | .algorithm_enc = SSL_3DES, |
473 | .algorithm_mac = SSL_SHA1, | 473 | .algorithm_mac = SSL_SHA1, |
474 | .algorithm_ssl = SSL_SSLV3, | 474 | .algorithm_ssl = SSL_SSLV3, |
475 | .algo_strength = SSL_HIGH|SSL_FIPS, | 475 | .algo_strength = SSL_HIGH, |
476 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 476 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
477 | .strength_bits = 112, | 477 | .strength_bits = 112, |
478 | .alg_bits = 168, | 478 | .alg_bits = 168, |
@@ -520,7 +520,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
520 | .algorithm_enc = SSL_3DES, | 520 | .algorithm_enc = SSL_3DES, |
521 | .algorithm_mac = SSL_SHA1, | 521 | .algorithm_mac = SSL_SHA1, |
522 | .algorithm_ssl = SSL_SSLV3, | 522 | .algorithm_ssl = SSL_SSLV3, |
523 | .algo_strength = SSL_HIGH|SSL_FIPS, | 523 | .algo_strength = SSL_HIGH, |
524 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 524 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
525 | .strength_bits = 112, | 525 | .strength_bits = 112, |
526 | .alg_bits = 168, | 526 | .alg_bits = 168, |
@@ -600,7 +600,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
600 | .algorithm_enc = SSL_3DES, | 600 | .algorithm_enc = SSL_3DES, |
601 | .algorithm_mac = SSL_SHA1, | 601 | .algorithm_mac = SSL_SHA1, |
602 | .algorithm_ssl = SSL_SSLV3, | 602 | .algorithm_ssl = SSL_SSLV3, |
603 | .algo_strength = SSL_HIGH|SSL_FIPS, | 603 | .algo_strength = SSL_HIGH, |
604 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 604 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
605 | .strength_bits = 112, | 605 | .strength_bits = 112, |
606 | .alg_bits = 168, | 606 | .alg_bits = 168, |
@@ -617,7 +617,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
617 | .algorithm_enc = SSL_AES128, | 617 | .algorithm_enc = SSL_AES128, |
618 | .algorithm_mac = SSL_SHA1, | 618 | .algorithm_mac = SSL_SHA1, |
619 | .algorithm_ssl = SSL_TLSV1, | 619 | .algorithm_ssl = SSL_TLSV1, |
620 | .algo_strength = SSL_HIGH|SSL_FIPS, | 620 | .algo_strength = SSL_HIGH, |
621 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 621 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
622 | .strength_bits = 128, | 622 | .strength_bits = 128, |
623 | .alg_bits = 128, | 623 | .alg_bits = 128, |
@@ -632,7 +632,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
632 | .algorithm_enc = SSL_AES128, | 632 | .algorithm_enc = SSL_AES128, |
633 | .algorithm_mac = SSL_SHA1, | 633 | .algorithm_mac = SSL_SHA1, |
634 | .algorithm_ssl = SSL_TLSV1, | 634 | .algorithm_ssl = SSL_TLSV1, |
635 | .algo_strength = SSL_HIGH|SSL_FIPS, | 635 | .algo_strength = SSL_HIGH, |
636 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 636 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
637 | .strength_bits = 128, | 637 | .strength_bits = 128, |
638 | .alg_bits = 128, | 638 | .alg_bits = 128, |
@@ -647,7 +647,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
647 | .algorithm_enc = SSL_AES128, | 647 | .algorithm_enc = SSL_AES128, |
648 | .algorithm_mac = SSL_SHA1, | 648 | .algorithm_mac = SSL_SHA1, |
649 | .algorithm_ssl = SSL_TLSV1, | 649 | .algorithm_ssl = SSL_TLSV1, |
650 | .algo_strength = SSL_HIGH|SSL_FIPS, | 650 | .algo_strength = SSL_HIGH, |
651 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 651 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
652 | .strength_bits = 128, | 652 | .strength_bits = 128, |
653 | .alg_bits = 128, | 653 | .alg_bits = 128, |
@@ -662,7 +662,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
662 | .algorithm_enc = SSL_AES128, | 662 | .algorithm_enc = SSL_AES128, |
663 | .algorithm_mac = SSL_SHA1, | 663 | .algorithm_mac = SSL_SHA1, |
664 | .algorithm_ssl = SSL_TLSV1, | 664 | .algorithm_ssl = SSL_TLSV1, |
665 | .algo_strength = SSL_HIGH|SSL_FIPS, | 665 | .algo_strength = SSL_HIGH, |
666 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 666 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
667 | .strength_bits = 128, | 667 | .strength_bits = 128, |
668 | .alg_bits = 128, | 668 | .alg_bits = 128, |
@@ -677,7 +677,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
677 | .algorithm_enc = SSL_AES128, | 677 | .algorithm_enc = SSL_AES128, |
678 | .algorithm_mac = SSL_SHA1, | 678 | .algorithm_mac = SSL_SHA1, |
679 | .algorithm_ssl = SSL_TLSV1, | 679 | .algorithm_ssl = SSL_TLSV1, |
680 | .algo_strength = SSL_HIGH|SSL_FIPS, | 680 | .algo_strength = SSL_HIGH, |
681 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 681 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
682 | .strength_bits = 128, | 682 | .strength_bits = 128, |
683 | .alg_bits = 128, | 683 | .alg_bits = 128, |
@@ -692,7 +692,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
692 | .algorithm_enc = SSL_AES128, | 692 | .algorithm_enc = SSL_AES128, |
693 | .algorithm_mac = SSL_SHA1, | 693 | .algorithm_mac = SSL_SHA1, |
694 | .algorithm_ssl = SSL_TLSV1, | 694 | .algorithm_ssl = SSL_TLSV1, |
695 | .algo_strength = SSL_HIGH|SSL_FIPS, | 695 | .algo_strength = SSL_HIGH, |
696 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 696 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
697 | .strength_bits = 128, | 697 | .strength_bits = 128, |
698 | .alg_bits = 128, | 698 | .alg_bits = 128, |
@@ -708,7 +708,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
708 | .algorithm_enc = SSL_AES256, | 708 | .algorithm_enc = SSL_AES256, |
709 | .algorithm_mac = SSL_SHA1, | 709 | .algorithm_mac = SSL_SHA1, |
710 | .algorithm_ssl = SSL_TLSV1, | 710 | .algorithm_ssl = SSL_TLSV1, |
711 | .algo_strength = SSL_HIGH|SSL_FIPS, | 711 | .algo_strength = SSL_HIGH, |
712 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 712 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
713 | .strength_bits = 256, | 713 | .strength_bits = 256, |
714 | .alg_bits = 256, | 714 | .alg_bits = 256, |
@@ -723,7 +723,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
723 | .algorithm_enc = SSL_AES256, | 723 | .algorithm_enc = SSL_AES256, |
724 | .algorithm_mac = SSL_SHA1, | 724 | .algorithm_mac = SSL_SHA1, |
725 | .algorithm_ssl = SSL_TLSV1, | 725 | .algorithm_ssl = SSL_TLSV1, |
726 | .algo_strength = SSL_HIGH|SSL_FIPS, | 726 | .algo_strength = SSL_HIGH, |
727 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 727 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
728 | .strength_bits = 256, | 728 | .strength_bits = 256, |
729 | .alg_bits = 256, | 729 | .alg_bits = 256, |
@@ -739,7 +739,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
739 | .algorithm_enc = SSL_AES256, | 739 | .algorithm_enc = SSL_AES256, |
740 | .algorithm_mac = SSL_SHA1, | 740 | .algorithm_mac = SSL_SHA1, |
741 | .algorithm_ssl = SSL_TLSV1, | 741 | .algorithm_ssl = SSL_TLSV1, |
742 | .algo_strength = SSL_HIGH|SSL_FIPS, | 742 | .algo_strength = SSL_HIGH, |
743 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 743 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
744 | .strength_bits = 256, | 744 | .strength_bits = 256, |
745 | .alg_bits = 256, | 745 | .alg_bits = 256, |
@@ -755,7 +755,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
755 | .algorithm_enc = SSL_AES256, | 755 | .algorithm_enc = SSL_AES256, |
756 | .algorithm_mac = SSL_SHA1, | 756 | .algorithm_mac = SSL_SHA1, |
757 | .algorithm_ssl = SSL_TLSV1, | 757 | .algorithm_ssl = SSL_TLSV1, |
758 | .algo_strength = SSL_HIGH|SSL_FIPS, | 758 | .algo_strength = SSL_HIGH, |
759 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 759 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
760 | .strength_bits = 256, | 760 | .strength_bits = 256, |
761 | .alg_bits = 256, | 761 | .alg_bits = 256, |
@@ -771,7 +771,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
771 | .algorithm_enc = SSL_AES256, | 771 | .algorithm_enc = SSL_AES256, |
772 | .algorithm_mac = SSL_SHA1, | 772 | .algorithm_mac = SSL_SHA1, |
773 | .algorithm_ssl = SSL_TLSV1, | 773 | .algorithm_ssl = SSL_TLSV1, |
774 | .algo_strength = SSL_HIGH|SSL_FIPS, | 774 | .algo_strength = SSL_HIGH, |
775 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 775 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
776 | .strength_bits = 256, | 776 | .strength_bits = 256, |
777 | .alg_bits = 256, | 777 | .alg_bits = 256, |
@@ -787,7 +787,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
787 | .algorithm_enc = SSL_AES256, | 787 | .algorithm_enc = SSL_AES256, |
788 | .algorithm_mac = SSL_SHA1, | 788 | .algorithm_mac = SSL_SHA1, |
789 | .algorithm_ssl = SSL_TLSV1, | 789 | .algorithm_ssl = SSL_TLSV1, |
790 | .algo_strength = SSL_HIGH|SSL_FIPS, | 790 | .algo_strength = SSL_HIGH, |
791 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 791 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
792 | .strength_bits = 256, | 792 | .strength_bits = 256, |
793 | .alg_bits = 256, | 793 | .alg_bits = 256, |
@@ -804,7 +804,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
804 | .algorithm_enc = SSL_eNULL, | 804 | .algorithm_enc = SSL_eNULL, |
805 | .algorithm_mac = SSL_SHA256, | 805 | .algorithm_mac = SSL_SHA256, |
806 | .algorithm_ssl = SSL_TLSV1_2, | 806 | .algorithm_ssl = SSL_TLSV1_2, |
807 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 807 | .algo_strength = SSL_STRONG_NONE, |
808 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 808 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
809 | .strength_bits = 0, | 809 | .strength_bits = 0, |
810 | .alg_bits = 0, | 810 | .alg_bits = 0, |
@@ -820,7 +820,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
820 | .algorithm_enc = SSL_AES128, | 820 | .algorithm_enc = SSL_AES128, |
821 | .algorithm_mac = SSL_SHA256, | 821 | .algorithm_mac = SSL_SHA256, |
822 | .algorithm_ssl = SSL_TLSV1_2, | 822 | .algorithm_ssl = SSL_TLSV1_2, |
823 | .algo_strength = SSL_HIGH|SSL_FIPS, | 823 | .algo_strength = SSL_HIGH, |
824 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 824 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
825 | .strength_bits = 128, | 825 | .strength_bits = 128, |
826 | .alg_bits = 128, | 826 | .alg_bits = 128, |
@@ -836,7 +836,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
836 | .algorithm_enc = SSL_AES256, | 836 | .algorithm_enc = SSL_AES256, |
837 | .algorithm_mac = SSL_SHA256, | 837 | .algorithm_mac = SSL_SHA256, |
838 | .algorithm_ssl = SSL_TLSV1_2, | 838 | .algorithm_ssl = SSL_TLSV1_2, |
839 | .algo_strength = SSL_HIGH|SSL_FIPS, | 839 | .algo_strength = SSL_HIGH, |
840 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 840 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
841 | .strength_bits = 256, | 841 | .strength_bits = 256, |
842 | .alg_bits = 256, | 842 | .alg_bits = 256, |
@@ -852,7 +852,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
852 | .algorithm_enc = SSL_AES128, | 852 | .algorithm_enc = SSL_AES128, |
853 | .algorithm_mac = SSL_SHA256, | 853 | .algorithm_mac = SSL_SHA256, |
854 | .algorithm_ssl = SSL_TLSV1_2, | 854 | .algorithm_ssl = SSL_TLSV1_2, |
855 | .algo_strength = SSL_HIGH|SSL_FIPS, | 855 | .algo_strength = SSL_HIGH, |
856 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 856 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
857 | .strength_bits = 128, | 857 | .strength_bits = 128, |
858 | .alg_bits = 128, | 858 | .alg_bits = 128, |
@@ -868,7 +868,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
868 | .algorithm_enc = SSL_AES128, | 868 | .algorithm_enc = SSL_AES128, |
869 | .algorithm_mac = SSL_SHA256, | 869 | .algorithm_mac = SSL_SHA256, |
870 | .algorithm_ssl = SSL_TLSV1_2, | 870 | .algorithm_ssl = SSL_TLSV1_2, |
871 | .algo_strength = SSL_HIGH|SSL_FIPS, | 871 | .algo_strength = SSL_HIGH, |
872 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 872 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
873 | .strength_bits = 128, | 873 | .strength_bits = 128, |
874 | .alg_bits = 128, | 874 | .alg_bits = 128, |
@@ -884,7 +884,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
884 | .algorithm_enc = SSL_AES128, | 884 | .algorithm_enc = SSL_AES128, |
885 | .algorithm_mac = SSL_SHA256, | 885 | .algorithm_mac = SSL_SHA256, |
886 | .algorithm_ssl = SSL_TLSV1_2, | 886 | .algorithm_ssl = SSL_TLSV1_2, |
887 | .algo_strength = SSL_HIGH|SSL_FIPS, | 887 | .algo_strength = SSL_HIGH, |
888 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 888 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
889 | .strength_bits = 128, | 889 | .strength_bits = 128, |
890 | .alg_bits = 128, | 890 | .alg_bits = 128, |
@@ -1001,7 +1001,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1001 | .algorithm_enc = SSL_AES128, | 1001 | .algorithm_enc = SSL_AES128, |
1002 | .algorithm_mac = SSL_SHA256, | 1002 | .algorithm_mac = SSL_SHA256, |
1003 | .algorithm_ssl = SSL_TLSV1_2, | 1003 | .algorithm_ssl = SSL_TLSV1_2, |
1004 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1004 | .algo_strength = SSL_HIGH, |
1005 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1005 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1006 | .strength_bits = 128, | 1006 | .strength_bits = 128, |
1007 | .alg_bits = 128, | 1007 | .alg_bits = 128, |
@@ -1017,7 +1017,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1017 | .algorithm_enc = SSL_AES256, | 1017 | .algorithm_enc = SSL_AES256, |
1018 | .algorithm_mac = SSL_SHA256, | 1018 | .algorithm_mac = SSL_SHA256, |
1019 | .algorithm_ssl = SSL_TLSV1_2, | 1019 | .algorithm_ssl = SSL_TLSV1_2, |
1020 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1020 | .algo_strength = SSL_HIGH, |
1021 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1021 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1022 | .strength_bits = 256, | 1022 | .strength_bits = 256, |
1023 | .alg_bits = 256, | 1023 | .alg_bits = 256, |
@@ -1033,7 +1033,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1033 | .algorithm_enc = SSL_AES256, | 1033 | .algorithm_enc = SSL_AES256, |
1034 | .algorithm_mac = SSL_SHA256, | 1034 | .algorithm_mac = SSL_SHA256, |
1035 | .algorithm_ssl = SSL_TLSV1_2, | 1035 | .algorithm_ssl = SSL_TLSV1_2, |
1036 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1036 | .algo_strength = SSL_HIGH, |
1037 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1037 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1038 | .strength_bits = 256, | 1038 | .strength_bits = 256, |
1039 | .alg_bits = 256, | 1039 | .alg_bits = 256, |
@@ -1049,7 +1049,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1049 | .algorithm_enc = SSL_AES256, | 1049 | .algorithm_enc = SSL_AES256, |
1050 | .algorithm_mac = SSL_SHA256, | 1050 | .algorithm_mac = SSL_SHA256, |
1051 | .algorithm_ssl = SSL_TLSV1_2, | 1051 | .algorithm_ssl = SSL_TLSV1_2, |
1052 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1052 | .algo_strength = SSL_HIGH, |
1053 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1053 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1054 | .strength_bits = 256, | 1054 | .strength_bits = 256, |
1055 | .alg_bits = 256, | 1055 | .alg_bits = 256, |
@@ -1065,7 +1065,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1065 | .algorithm_enc = SSL_AES256, | 1065 | .algorithm_enc = SSL_AES256, |
1066 | .algorithm_mac = SSL_SHA256, | 1066 | .algorithm_mac = SSL_SHA256, |
1067 | .algorithm_ssl = SSL_TLSV1_2, | 1067 | .algorithm_ssl = SSL_TLSV1_2, |
1068 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1068 | .algo_strength = SSL_HIGH, |
1069 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1069 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1070 | .strength_bits = 256, | 1070 | .strength_bits = 256, |
1071 | .alg_bits = 256, | 1071 | .alg_bits = 256, |
@@ -1081,7 +1081,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1081 | .algorithm_enc = SSL_AES128, | 1081 | .algorithm_enc = SSL_AES128, |
1082 | .algorithm_mac = SSL_SHA256, | 1082 | .algorithm_mac = SSL_SHA256, |
1083 | .algorithm_ssl = SSL_TLSV1_2, | 1083 | .algorithm_ssl = SSL_TLSV1_2, |
1084 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1084 | .algo_strength = SSL_HIGH, |
1085 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1085 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1086 | .strength_bits = 128, | 1086 | .strength_bits = 128, |
1087 | .alg_bits = 128, | 1087 | .alg_bits = 128, |
@@ -1097,7 +1097,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1097 | .algorithm_enc = SSL_AES256, | 1097 | .algorithm_enc = SSL_AES256, |
1098 | .algorithm_mac = SSL_SHA256, | 1098 | .algorithm_mac = SSL_SHA256, |
1099 | .algorithm_ssl = SSL_TLSV1_2, | 1099 | .algorithm_ssl = SSL_TLSV1_2, |
1100 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1100 | .algo_strength = SSL_HIGH, |
1101 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1101 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1102 | .strength_bits = 256, | 1102 | .strength_bits = 256, |
1103 | .alg_bits = 256, | 1103 | .alg_bits = 256, |
@@ -1291,7 +1291,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1291 | .algorithm_enc = SSL_3DES, | 1291 | .algorithm_enc = SSL_3DES, |
1292 | .algorithm_mac = SSL_SHA1, | 1292 | .algorithm_mac = SSL_SHA1, |
1293 | .algorithm_ssl = SSL_TLSV1, | 1293 | .algorithm_ssl = SSL_TLSV1, |
1294 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1294 | .algo_strength = SSL_HIGH, |
1295 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1295 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1296 | .strength_bits = 112, | 1296 | .strength_bits = 112, |
1297 | .alg_bits = 168, | 1297 | .alg_bits = 168, |
@@ -1307,7 +1307,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1307 | .algorithm_enc = SSL_AES128, | 1307 | .algorithm_enc = SSL_AES128, |
1308 | .algorithm_mac = SSL_SHA1, | 1308 | .algorithm_mac = SSL_SHA1, |
1309 | .algorithm_ssl = SSL_TLSV1, | 1309 | .algorithm_ssl = SSL_TLSV1, |
1310 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1310 | .algo_strength = SSL_HIGH, |
1311 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1311 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1312 | .strength_bits = 128, | 1312 | .strength_bits = 128, |
1313 | .alg_bits = 128, | 1313 | .alg_bits = 128, |
@@ -1323,7 +1323,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1323 | .algorithm_enc = SSL_AES256, | 1323 | .algorithm_enc = SSL_AES256, |
1324 | .algorithm_mac = SSL_SHA1, | 1324 | .algorithm_mac = SSL_SHA1, |
1325 | .algorithm_ssl = SSL_TLSV1, | 1325 | .algorithm_ssl = SSL_TLSV1, |
1326 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1326 | .algo_strength = SSL_HIGH, |
1327 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1327 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1328 | .strength_bits = 256, | 1328 | .strength_bits = 256, |
1329 | .alg_bits = 256, | 1329 | .alg_bits = 256, |
@@ -1342,7 +1342,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1342 | .algorithm_enc = SSL_AES128GCM, | 1342 | .algorithm_enc = SSL_AES128GCM, |
1343 | .algorithm_mac = SSL_AEAD, | 1343 | .algorithm_mac = SSL_AEAD, |
1344 | .algorithm_ssl = SSL_TLSV1_2, | 1344 | .algorithm_ssl = SSL_TLSV1_2, |
1345 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1345 | .algo_strength = SSL_HIGH, |
1346 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1346 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1347 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1347 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1348 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1348 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1360,7 +1360,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1360 | .algorithm_enc = SSL_AES256GCM, | 1360 | .algorithm_enc = SSL_AES256GCM, |
1361 | .algorithm_mac = SSL_AEAD, | 1361 | .algorithm_mac = SSL_AEAD, |
1362 | .algorithm_ssl = SSL_TLSV1_2, | 1362 | .algorithm_ssl = SSL_TLSV1_2, |
1363 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1363 | .algo_strength = SSL_HIGH, |
1364 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1364 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1365 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1365 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1366 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1366 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1378,7 +1378,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1378 | .algorithm_enc = SSL_AES128GCM, | 1378 | .algorithm_enc = SSL_AES128GCM, |
1379 | .algorithm_mac = SSL_AEAD, | 1379 | .algorithm_mac = SSL_AEAD, |
1380 | .algorithm_ssl = SSL_TLSV1_2, | 1380 | .algorithm_ssl = SSL_TLSV1_2, |
1381 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1381 | .algo_strength = SSL_HIGH, |
1382 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1382 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1383 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1383 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1384 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1384 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1396,7 +1396,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1396 | .algorithm_enc = SSL_AES256GCM, | 1396 | .algorithm_enc = SSL_AES256GCM, |
1397 | .algorithm_mac = SSL_AEAD, | 1397 | .algorithm_mac = SSL_AEAD, |
1398 | .algorithm_ssl = SSL_TLSV1_2, | 1398 | .algorithm_ssl = SSL_TLSV1_2, |
1399 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1399 | .algo_strength = SSL_HIGH, |
1400 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1400 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1401 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1401 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1402 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1402 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1414,7 +1414,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1414 | .algorithm_enc = SSL_AES128GCM, | 1414 | .algorithm_enc = SSL_AES128GCM, |
1415 | .algorithm_mac = SSL_AEAD, | 1415 | .algorithm_mac = SSL_AEAD, |
1416 | .algorithm_ssl = SSL_TLSV1_2, | 1416 | .algorithm_ssl = SSL_TLSV1_2, |
1417 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1417 | .algo_strength = SSL_HIGH, |
1418 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1418 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1419 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1419 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1420 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1420 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1432,7 +1432,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1432 | .algorithm_enc = SSL_AES256GCM, | 1432 | .algorithm_enc = SSL_AES256GCM, |
1433 | .algorithm_mac = SSL_AEAD, | 1433 | .algorithm_mac = SSL_AEAD, |
1434 | .algorithm_ssl = SSL_TLSV1_2, | 1434 | .algorithm_ssl = SSL_TLSV1_2, |
1435 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1435 | .algo_strength = SSL_HIGH, |
1436 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1436 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1437 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1437 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1438 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1438 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1450,7 +1450,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1450 | .algorithm_enc = SSL_AES128GCM, | 1450 | .algorithm_enc = SSL_AES128GCM, |
1451 | .algorithm_mac = SSL_AEAD, | 1451 | .algorithm_mac = SSL_AEAD, |
1452 | .algorithm_ssl = SSL_TLSV1_2, | 1452 | .algorithm_ssl = SSL_TLSV1_2, |
1453 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1453 | .algo_strength = SSL_HIGH, |
1454 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1454 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1455 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1455 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1456 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1456 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1468,7 +1468,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1468 | .algorithm_enc = SSL_AES256GCM, | 1468 | .algorithm_enc = SSL_AES256GCM, |
1469 | .algorithm_mac = SSL_AEAD, | 1469 | .algorithm_mac = SSL_AEAD, |
1470 | .algorithm_ssl = SSL_TLSV1_2, | 1470 | .algorithm_ssl = SSL_TLSV1_2, |
1471 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1471 | .algo_strength = SSL_HIGH, |
1472 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1472 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1473 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1473 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1474 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1474 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1486,7 +1486,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1486 | .algorithm_enc = SSL_AES128GCM, | 1486 | .algorithm_enc = SSL_AES128GCM, |
1487 | .algorithm_mac = SSL_AEAD, | 1487 | .algorithm_mac = SSL_AEAD, |
1488 | .algorithm_ssl = SSL_TLSV1_2, | 1488 | .algorithm_ssl = SSL_TLSV1_2, |
1489 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1489 | .algo_strength = SSL_HIGH, |
1490 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1490 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1491 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1491 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1492 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1492 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1504,7 +1504,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1504 | .algorithm_enc = SSL_AES256GCM, | 1504 | .algorithm_enc = SSL_AES256GCM, |
1505 | .algorithm_mac = SSL_AEAD, | 1505 | .algorithm_mac = SSL_AEAD, |
1506 | .algorithm_ssl = SSL_TLSV1_2, | 1506 | .algorithm_ssl = SSL_TLSV1_2, |
1507 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1507 | .algo_strength = SSL_HIGH, |
1508 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1508 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1509 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1509 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1510 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1510 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1522,7 +1522,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1522 | .algorithm_enc = SSL_AES128GCM, | 1522 | .algorithm_enc = SSL_AES128GCM, |
1523 | .algorithm_mac = SSL_AEAD, | 1523 | .algorithm_mac = SSL_AEAD, |
1524 | .algorithm_ssl = SSL_TLSV1_2, | 1524 | .algorithm_ssl = SSL_TLSV1_2, |
1525 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1525 | .algo_strength = SSL_HIGH, |
1526 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1526 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1527 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1527 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1528 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1528 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1540,7 +1540,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1540 | .algorithm_enc = SSL_AES256GCM, | 1540 | .algorithm_enc = SSL_AES256GCM, |
1541 | .algorithm_mac = SSL_AEAD, | 1541 | .algorithm_mac = SSL_AEAD, |
1542 | .algorithm_ssl = SSL_TLSV1_2, | 1542 | .algorithm_ssl = SSL_TLSV1_2, |
1543 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1543 | .algo_strength = SSL_HIGH, |
1544 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1544 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1545 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1545 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1546 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1546 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1558,7 +1558,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1558 | .algorithm_enc = SSL_eNULL, | 1558 | .algorithm_enc = SSL_eNULL, |
1559 | .algorithm_mac = SSL_SHA1, | 1559 | .algorithm_mac = SSL_SHA1, |
1560 | .algorithm_ssl = SSL_TLSV1, | 1560 | .algorithm_ssl = SSL_TLSV1, |
1561 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1561 | .algo_strength = SSL_STRONG_NONE, |
1562 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1562 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1563 | .strength_bits = 0, | 1563 | .strength_bits = 0, |
1564 | .alg_bits = 0, | 1564 | .alg_bits = 0, |
@@ -1590,7 +1590,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1590 | .algorithm_enc = SSL_3DES, | 1590 | .algorithm_enc = SSL_3DES, |
1591 | .algorithm_mac = SSL_SHA1, | 1591 | .algorithm_mac = SSL_SHA1, |
1592 | .algorithm_ssl = SSL_TLSV1, | 1592 | .algorithm_ssl = SSL_TLSV1, |
1593 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1593 | .algo_strength = SSL_HIGH, |
1594 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1594 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1595 | .strength_bits = 112, | 1595 | .strength_bits = 112, |
1596 | .alg_bits = 168, | 1596 | .alg_bits = 168, |
@@ -1606,7 +1606,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1606 | .algorithm_enc = SSL_AES128, | 1606 | .algorithm_enc = SSL_AES128, |
1607 | .algorithm_mac = SSL_SHA1, | 1607 | .algorithm_mac = SSL_SHA1, |
1608 | .algorithm_ssl = SSL_TLSV1, | 1608 | .algorithm_ssl = SSL_TLSV1, |
1609 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1609 | .algo_strength = SSL_HIGH, |
1610 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1610 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1611 | .strength_bits = 128, | 1611 | .strength_bits = 128, |
1612 | .alg_bits = 128, | 1612 | .alg_bits = 128, |
@@ -1622,7 +1622,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1622 | .algorithm_enc = SSL_AES256, | 1622 | .algorithm_enc = SSL_AES256, |
1623 | .algorithm_mac = SSL_SHA1, | 1623 | .algorithm_mac = SSL_SHA1, |
1624 | .algorithm_ssl = SSL_TLSV1, | 1624 | .algorithm_ssl = SSL_TLSV1, |
1625 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1625 | .algo_strength = SSL_HIGH, |
1626 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1626 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1627 | .strength_bits = 256, | 1627 | .strength_bits = 256, |
1628 | .alg_bits = 256, | 1628 | .alg_bits = 256, |
@@ -1638,7 +1638,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1638 | .algorithm_enc = SSL_eNULL, | 1638 | .algorithm_enc = SSL_eNULL, |
1639 | .algorithm_mac = SSL_SHA1, | 1639 | .algorithm_mac = SSL_SHA1, |
1640 | .algorithm_ssl = SSL_TLSV1, | 1640 | .algorithm_ssl = SSL_TLSV1, |
1641 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1641 | .algo_strength = SSL_STRONG_NONE, |
1642 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1642 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1643 | .strength_bits = 0, | 1643 | .strength_bits = 0, |
1644 | .alg_bits = 0, | 1644 | .alg_bits = 0, |
@@ -1670,7 +1670,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1670 | .algorithm_enc = SSL_3DES, | 1670 | .algorithm_enc = SSL_3DES, |
1671 | .algorithm_mac = SSL_SHA1, | 1671 | .algorithm_mac = SSL_SHA1, |
1672 | .algorithm_ssl = SSL_TLSV1, | 1672 | .algorithm_ssl = SSL_TLSV1, |
1673 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1673 | .algo_strength = SSL_HIGH, |
1674 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1674 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1675 | .strength_bits = 112, | 1675 | .strength_bits = 112, |
1676 | .alg_bits = 168, | 1676 | .alg_bits = 168, |
@@ -1686,7 +1686,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1686 | .algorithm_enc = SSL_AES128, | 1686 | .algorithm_enc = SSL_AES128, |
1687 | .algorithm_mac = SSL_SHA1, | 1687 | .algorithm_mac = SSL_SHA1, |
1688 | .algorithm_ssl = SSL_TLSV1, | 1688 | .algorithm_ssl = SSL_TLSV1, |
1689 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1689 | .algo_strength = SSL_HIGH, |
1690 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1690 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1691 | .strength_bits = 128, | 1691 | .strength_bits = 128, |
1692 | .alg_bits = 128, | 1692 | .alg_bits = 128, |
@@ -1702,7 +1702,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1702 | .algorithm_enc = SSL_AES256, | 1702 | .algorithm_enc = SSL_AES256, |
1703 | .algorithm_mac = SSL_SHA1, | 1703 | .algorithm_mac = SSL_SHA1, |
1704 | .algorithm_ssl = SSL_TLSV1, | 1704 | .algorithm_ssl = SSL_TLSV1, |
1705 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1705 | .algo_strength = SSL_HIGH, |
1706 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1706 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1707 | .strength_bits = 256, | 1707 | .strength_bits = 256, |
1708 | .alg_bits = 256, | 1708 | .alg_bits = 256, |
@@ -1718,7 +1718,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1718 | .algorithm_enc = SSL_eNULL, | 1718 | .algorithm_enc = SSL_eNULL, |
1719 | .algorithm_mac = SSL_SHA1, | 1719 | .algorithm_mac = SSL_SHA1, |
1720 | .algorithm_ssl = SSL_TLSV1, | 1720 | .algorithm_ssl = SSL_TLSV1, |
1721 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1721 | .algo_strength = SSL_STRONG_NONE, |
1722 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1722 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1723 | .strength_bits = 0, | 1723 | .strength_bits = 0, |
1724 | .alg_bits = 0, | 1724 | .alg_bits = 0, |
@@ -1750,7 +1750,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1750 | .algorithm_enc = SSL_3DES, | 1750 | .algorithm_enc = SSL_3DES, |
1751 | .algorithm_mac = SSL_SHA1, | 1751 | .algorithm_mac = SSL_SHA1, |
1752 | .algorithm_ssl = SSL_TLSV1, | 1752 | .algorithm_ssl = SSL_TLSV1, |
1753 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1753 | .algo_strength = SSL_HIGH, |
1754 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1754 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1755 | .strength_bits = 112, | 1755 | .strength_bits = 112, |
1756 | .alg_bits = 168, | 1756 | .alg_bits = 168, |
@@ -1766,7 +1766,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1766 | .algorithm_enc = SSL_AES128, | 1766 | .algorithm_enc = SSL_AES128, |
1767 | .algorithm_mac = SSL_SHA1, | 1767 | .algorithm_mac = SSL_SHA1, |
1768 | .algorithm_ssl = SSL_TLSV1, | 1768 | .algorithm_ssl = SSL_TLSV1, |
1769 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1769 | .algo_strength = SSL_HIGH, |
1770 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1770 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1771 | .strength_bits = 128, | 1771 | .strength_bits = 128, |
1772 | .alg_bits = 128, | 1772 | .alg_bits = 128, |
@@ -1782,7 +1782,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1782 | .algorithm_enc = SSL_AES256, | 1782 | .algorithm_enc = SSL_AES256, |
1783 | .algorithm_mac = SSL_SHA1, | 1783 | .algorithm_mac = SSL_SHA1, |
1784 | .algorithm_ssl = SSL_TLSV1, | 1784 | .algorithm_ssl = SSL_TLSV1, |
1785 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1785 | .algo_strength = SSL_HIGH, |
1786 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1786 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1787 | .strength_bits = 256, | 1787 | .strength_bits = 256, |
1788 | .alg_bits = 256, | 1788 | .alg_bits = 256, |
@@ -1798,7 +1798,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1798 | .algorithm_enc = SSL_eNULL, | 1798 | .algorithm_enc = SSL_eNULL, |
1799 | .algorithm_mac = SSL_SHA1, | 1799 | .algorithm_mac = SSL_SHA1, |
1800 | .algorithm_ssl = SSL_TLSV1, | 1800 | .algorithm_ssl = SSL_TLSV1, |
1801 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1801 | .algo_strength = SSL_STRONG_NONE, |
1802 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1802 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1803 | .strength_bits = 0, | 1803 | .strength_bits = 0, |
1804 | .alg_bits = 0, | 1804 | .alg_bits = 0, |
@@ -1830,7 +1830,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1830 | .algorithm_enc = SSL_3DES, | 1830 | .algorithm_enc = SSL_3DES, |
1831 | .algorithm_mac = SSL_SHA1, | 1831 | .algorithm_mac = SSL_SHA1, |
1832 | .algorithm_ssl = SSL_TLSV1, | 1832 | .algorithm_ssl = SSL_TLSV1, |
1833 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1833 | .algo_strength = SSL_HIGH, |
1834 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1834 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1835 | .strength_bits = 112, | 1835 | .strength_bits = 112, |
1836 | .alg_bits = 168, | 1836 | .alg_bits = 168, |
@@ -1846,7 +1846,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1846 | .algorithm_enc = SSL_AES128, | 1846 | .algorithm_enc = SSL_AES128, |
1847 | .algorithm_mac = SSL_SHA1, | 1847 | .algorithm_mac = SSL_SHA1, |
1848 | .algorithm_ssl = SSL_TLSV1, | 1848 | .algorithm_ssl = SSL_TLSV1, |
1849 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1849 | .algo_strength = SSL_HIGH, |
1850 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1850 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1851 | .strength_bits = 128, | 1851 | .strength_bits = 128, |
1852 | .alg_bits = 128, | 1852 | .alg_bits = 128, |
@@ -1862,7 +1862,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1862 | .algorithm_enc = SSL_AES256, | 1862 | .algorithm_enc = SSL_AES256, |
1863 | .algorithm_mac = SSL_SHA1, | 1863 | .algorithm_mac = SSL_SHA1, |
1864 | .algorithm_ssl = SSL_TLSV1, | 1864 | .algorithm_ssl = SSL_TLSV1, |
1865 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1865 | .algo_strength = SSL_HIGH, |
1866 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1866 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1867 | .strength_bits = 256, | 1867 | .strength_bits = 256, |
1868 | .alg_bits = 256, | 1868 | .alg_bits = 256, |
@@ -1878,7 +1878,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1878 | .algorithm_enc = SSL_eNULL, | 1878 | .algorithm_enc = SSL_eNULL, |
1879 | .algorithm_mac = SSL_SHA1, | 1879 | .algorithm_mac = SSL_SHA1, |
1880 | .algorithm_ssl = SSL_TLSV1, | 1880 | .algorithm_ssl = SSL_TLSV1, |
1881 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1881 | .algo_strength = SSL_STRONG_NONE, |
1882 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1882 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1883 | .strength_bits = 0, | 1883 | .strength_bits = 0, |
1884 | .alg_bits = 0, | 1884 | .alg_bits = 0, |
@@ -1910,7 +1910,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1910 | .algorithm_enc = SSL_3DES, | 1910 | .algorithm_enc = SSL_3DES, |
1911 | .algorithm_mac = SSL_SHA1, | 1911 | .algorithm_mac = SSL_SHA1, |
1912 | .algorithm_ssl = SSL_TLSV1, | 1912 | .algorithm_ssl = SSL_TLSV1, |
1913 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1913 | .algo_strength = SSL_HIGH, |
1914 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1914 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1915 | .strength_bits = 112, | 1915 | .strength_bits = 112, |
1916 | .alg_bits = 168, | 1916 | .alg_bits = 168, |
@@ -1926,7 +1926,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1926 | .algorithm_enc = SSL_AES128, | 1926 | .algorithm_enc = SSL_AES128, |
1927 | .algorithm_mac = SSL_SHA1, | 1927 | .algorithm_mac = SSL_SHA1, |
1928 | .algorithm_ssl = SSL_TLSV1, | 1928 | .algorithm_ssl = SSL_TLSV1, |
1929 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1929 | .algo_strength = SSL_HIGH, |
1930 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1930 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1931 | .strength_bits = 128, | 1931 | .strength_bits = 128, |
1932 | .alg_bits = 128, | 1932 | .alg_bits = 128, |
@@ -1942,7 +1942,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1942 | .algorithm_enc = SSL_AES256, | 1942 | .algorithm_enc = SSL_AES256, |
1943 | .algorithm_mac = SSL_SHA1, | 1943 | .algorithm_mac = SSL_SHA1, |
1944 | .algorithm_ssl = SSL_TLSV1, | 1944 | .algorithm_ssl = SSL_TLSV1, |
1945 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1945 | .algo_strength = SSL_HIGH, |
1946 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1946 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1947 | .strength_bits = 256, | 1947 | .strength_bits = 256, |
1948 | .alg_bits = 256, | 1948 | .alg_bits = 256, |
@@ -1961,7 +1961,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1961 | .algorithm_enc = SSL_AES128, | 1961 | .algorithm_enc = SSL_AES128, |
1962 | .algorithm_mac = SSL_SHA256, | 1962 | .algorithm_mac = SSL_SHA256, |
1963 | .algorithm_ssl = SSL_TLSV1_2, | 1963 | .algorithm_ssl = SSL_TLSV1_2, |
1964 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1964 | .algo_strength = SSL_HIGH, |
1965 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 1965 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
1966 | .strength_bits = 128, | 1966 | .strength_bits = 128, |
1967 | .alg_bits = 128, | 1967 | .alg_bits = 128, |
@@ -1977,7 +1977,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1977 | .algorithm_enc = SSL_AES256, | 1977 | .algorithm_enc = SSL_AES256, |
1978 | .algorithm_mac = SSL_SHA384, | 1978 | .algorithm_mac = SSL_SHA384, |
1979 | .algorithm_ssl = SSL_TLSV1_2, | 1979 | .algorithm_ssl = SSL_TLSV1_2, |
1980 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1980 | .algo_strength = SSL_HIGH, |
1981 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 1981 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
1982 | .strength_bits = 256, | 1982 | .strength_bits = 256, |
1983 | .alg_bits = 256, | 1983 | .alg_bits = 256, |
@@ -1993,7 +1993,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1993 | .algorithm_enc = SSL_AES128, | 1993 | .algorithm_enc = SSL_AES128, |
1994 | .algorithm_mac = SSL_SHA256, | 1994 | .algorithm_mac = SSL_SHA256, |
1995 | .algorithm_ssl = SSL_TLSV1_2, | 1995 | .algorithm_ssl = SSL_TLSV1_2, |
1996 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1996 | .algo_strength = SSL_HIGH, |
1997 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 1997 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
1998 | .strength_bits = 128, | 1998 | .strength_bits = 128, |
1999 | .alg_bits = 128, | 1999 | .alg_bits = 128, |
@@ -2009,7 +2009,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2009 | .algorithm_enc = SSL_AES256, | 2009 | .algorithm_enc = SSL_AES256, |
2010 | .algorithm_mac = SSL_SHA384, | 2010 | .algorithm_mac = SSL_SHA384, |
2011 | .algorithm_ssl = SSL_TLSV1_2, | 2011 | .algorithm_ssl = SSL_TLSV1_2, |
2012 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2012 | .algo_strength = SSL_HIGH, |
2013 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 2013 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
2014 | .strength_bits = 256, | 2014 | .strength_bits = 256, |
2015 | .alg_bits = 256, | 2015 | .alg_bits = 256, |
@@ -2025,7 +2025,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2025 | .algorithm_enc = SSL_AES128, | 2025 | .algorithm_enc = SSL_AES128, |
2026 | .algorithm_mac = SSL_SHA256, | 2026 | .algorithm_mac = SSL_SHA256, |
2027 | .algorithm_ssl = SSL_TLSV1_2, | 2027 | .algorithm_ssl = SSL_TLSV1_2, |
2028 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2028 | .algo_strength = SSL_HIGH, |
2029 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 2029 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
2030 | .strength_bits = 128, | 2030 | .strength_bits = 128, |
2031 | .alg_bits = 128, | 2031 | .alg_bits = 128, |
@@ -2041,7 +2041,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2041 | .algorithm_enc = SSL_AES256, | 2041 | .algorithm_enc = SSL_AES256, |
2042 | .algorithm_mac = SSL_SHA384, | 2042 | .algorithm_mac = SSL_SHA384, |
2043 | .algorithm_ssl = SSL_TLSV1_2, | 2043 | .algorithm_ssl = SSL_TLSV1_2, |
2044 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2044 | .algo_strength = SSL_HIGH, |
2045 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 2045 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
2046 | .strength_bits = 256, | 2046 | .strength_bits = 256, |
2047 | .alg_bits = 256, | 2047 | .alg_bits = 256, |
@@ -2057,7 +2057,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2057 | .algorithm_enc = SSL_AES128, | 2057 | .algorithm_enc = SSL_AES128, |
2058 | .algorithm_mac = SSL_SHA256, | 2058 | .algorithm_mac = SSL_SHA256, |
2059 | .algorithm_ssl = SSL_TLSV1_2, | 2059 | .algorithm_ssl = SSL_TLSV1_2, |
2060 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2060 | .algo_strength = SSL_HIGH, |
2061 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 2061 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
2062 | .strength_bits = 128, | 2062 | .strength_bits = 128, |
2063 | .alg_bits = 128, | 2063 | .alg_bits = 128, |
@@ -2073,7 +2073,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2073 | .algorithm_enc = SSL_AES256, | 2073 | .algorithm_enc = SSL_AES256, |
2074 | .algorithm_mac = SSL_SHA384, | 2074 | .algorithm_mac = SSL_SHA384, |
2075 | .algorithm_ssl = SSL_TLSV1_2, | 2075 | .algorithm_ssl = SSL_TLSV1_2, |
2076 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2076 | .algo_strength = SSL_HIGH, |
2077 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 2077 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
2078 | .strength_bits = 256, | 2078 | .strength_bits = 256, |
2079 | .alg_bits = 256, | 2079 | .alg_bits = 256, |
@@ -2091,7 +2091,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2091 | .algorithm_enc = SSL_AES128GCM, | 2091 | .algorithm_enc = SSL_AES128GCM, |
2092 | .algorithm_mac = SSL_AEAD, | 2092 | .algorithm_mac = SSL_AEAD, |
2093 | .algorithm_ssl = SSL_TLSV1_2, | 2093 | .algorithm_ssl = SSL_TLSV1_2, |
2094 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2094 | .algo_strength = SSL_HIGH, |
2095 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2095 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2096 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2096 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2097 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2097 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2109,7 +2109,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2109 | .algorithm_enc = SSL_AES256GCM, | 2109 | .algorithm_enc = SSL_AES256GCM, |
2110 | .algorithm_mac = SSL_AEAD, | 2110 | .algorithm_mac = SSL_AEAD, |
2111 | .algorithm_ssl = SSL_TLSV1_2, | 2111 | .algorithm_ssl = SSL_TLSV1_2, |
2112 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2112 | .algo_strength = SSL_HIGH, |
2113 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2113 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2114 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2114 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2115 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2115 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2127,7 +2127,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2127 | .algorithm_enc = SSL_AES128GCM, | 2127 | .algorithm_enc = SSL_AES128GCM, |
2128 | .algorithm_mac = SSL_AEAD, | 2128 | .algorithm_mac = SSL_AEAD, |
2129 | .algorithm_ssl = SSL_TLSV1_2, | 2129 | .algorithm_ssl = SSL_TLSV1_2, |
2130 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2130 | .algo_strength = SSL_HIGH, |
2131 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2131 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2132 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2132 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2133 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2133 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2145,7 +2145,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2145 | .algorithm_enc = SSL_AES256GCM, | 2145 | .algorithm_enc = SSL_AES256GCM, |
2146 | .algorithm_mac = SSL_AEAD, | 2146 | .algorithm_mac = SSL_AEAD, |
2147 | .algorithm_ssl = SSL_TLSV1_2, | 2147 | .algorithm_ssl = SSL_TLSV1_2, |
2148 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2148 | .algo_strength = SSL_HIGH, |
2149 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2149 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2150 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2150 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2151 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2151 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2163,7 +2163,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2163 | .algorithm_enc = SSL_AES128GCM, | 2163 | .algorithm_enc = SSL_AES128GCM, |
2164 | .algorithm_mac = SSL_AEAD, | 2164 | .algorithm_mac = SSL_AEAD, |
2165 | .algorithm_ssl = SSL_TLSV1_2, | 2165 | .algorithm_ssl = SSL_TLSV1_2, |
2166 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2166 | .algo_strength = SSL_HIGH, |
2167 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2167 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2168 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2168 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2169 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2169 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2181,7 +2181,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2181 | .algorithm_enc = SSL_AES256GCM, | 2181 | .algorithm_enc = SSL_AES256GCM, |
2182 | .algorithm_mac = SSL_AEAD, | 2182 | .algorithm_mac = SSL_AEAD, |
2183 | .algorithm_ssl = SSL_TLSV1_2, | 2183 | .algorithm_ssl = SSL_TLSV1_2, |
2184 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2184 | .algo_strength = SSL_HIGH, |
2185 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2185 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2186 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2186 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2187 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2187 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2199,7 +2199,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2199 | .algorithm_enc = SSL_AES128GCM, | 2199 | .algorithm_enc = SSL_AES128GCM, |
2200 | .algorithm_mac = SSL_AEAD, | 2200 | .algorithm_mac = SSL_AEAD, |
2201 | .algorithm_ssl = SSL_TLSV1_2, | 2201 | .algorithm_ssl = SSL_TLSV1_2, |
2202 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2202 | .algo_strength = SSL_HIGH, |
2203 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2203 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2204 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2204 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2205 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2205 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2217,7 +2217,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2217 | .algorithm_enc = SSL_AES256GCM, | 2217 | .algorithm_enc = SSL_AES256GCM, |
2218 | .algorithm_mac = SSL_AEAD, | 2218 | .algorithm_mac = SSL_AEAD, |
2219 | .algorithm_ssl = SSL_TLSV1_2, | 2219 | .algorithm_ssl = SSL_TLSV1_2, |
2220 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2220 | .algo_strength = SSL_HIGH, |
2221 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2221 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2222 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2222 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2223 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2223 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c index 261bd2d4f6..e1c18bd10d 100644 --- a/src/lib/libssl/src/ssl/s3_lib.c +++ b/src/lib/libssl/src/ssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.63 2014/07/08 21:31:54 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.64 2014/07/08 21:50:40 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -196,7 +196,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
196 | .algorithm_enc = SSL_eNULL, | 196 | .algorithm_enc = SSL_eNULL, |
197 | .algorithm_mac = SSL_SHA1, | 197 | .algorithm_mac = SSL_SHA1, |
198 | .algorithm_ssl = SSL_SSLV3, | 198 | .algorithm_ssl = SSL_SSLV3, |
199 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 199 | .algo_strength = SSL_STRONG_NONE, |
200 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 200 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
201 | .strength_bits = 0, | 201 | .strength_bits = 0, |
202 | .alg_bits = 0, | 202 | .alg_bits = 0, |
@@ -326,7 +326,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
326 | .algorithm_enc = SSL_3DES, | 326 | .algorithm_enc = SSL_3DES, |
327 | .algorithm_mac = SSL_SHA1, | 327 | .algorithm_mac = SSL_SHA1, |
328 | .algorithm_ssl = SSL_SSLV3, | 328 | .algorithm_ssl = SSL_SSLV3, |
329 | .algo_strength = SSL_HIGH|SSL_FIPS, | 329 | .algo_strength = SSL_HIGH, |
330 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 330 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
331 | .strength_bits = 112, | 331 | .strength_bits = 112, |
332 | .alg_bits = 168, | 332 | .alg_bits = 168, |
@@ -375,7 +375,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
375 | .algorithm_enc = SSL_3DES, | 375 | .algorithm_enc = SSL_3DES, |
376 | .algorithm_mac = SSL_SHA1, | 376 | .algorithm_mac = SSL_SHA1, |
377 | .algorithm_ssl = SSL_SSLV3, | 377 | .algorithm_ssl = SSL_SSLV3, |
378 | .algo_strength = SSL_HIGH|SSL_FIPS, | 378 | .algo_strength = SSL_HIGH, |
379 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 379 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
380 | .strength_bits = 112, | 380 | .strength_bits = 112, |
381 | .alg_bits = 168, | 381 | .alg_bits = 168, |
@@ -423,7 +423,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
423 | .algorithm_enc = SSL_3DES, | 423 | .algorithm_enc = SSL_3DES, |
424 | .algorithm_mac = SSL_SHA1, | 424 | .algorithm_mac = SSL_SHA1, |
425 | .algorithm_ssl = SSL_SSLV3, | 425 | .algorithm_ssl = SSL_SSLV3, |
426 | .algo_strength = SSL_HIGH|SSL_FIPS, | 426 | .algo_strength = SSL_HIGH, |
427 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 427 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
428 | .strength_bits = 112, | 428 | .strength_bits = 112, |
429 | .alg_bits = 168, | 429 | .alg_bits = 168, |
@@ -472,7 +472,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
472 | .algorithm_enc = SSL_3DES, | 472 | .algorithm_enc = SSL_3DES, |
473 | .algorithm_mac = SSL_SHA1, | 473 | .algorithm_mac = SSL_SHA1, |
474 | .algorithm_ssl = SSL_SSLV3, | 474 | .algorithm_ssl = SSL_SSLV3, |
475 | .algo_strength = SSL_HIGH|SSL_FIPS, | 475 | .algo_strength = SSL_HIGH, |
476 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 476 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
477 | .strength_bits = 112, | 477 | .strength_bits = 112, |
478 | .alg_bits = 168, | 478 | .alg_bits = 168, |
@@ -520,7 +520,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
520 | .algorithm_enc = SSL_3DES, | 520 | .algorithm_enc = SSL_3DES, |
521 | .algorithm_mac = SSL_SHA1, | 521 | .algorithm_mac = SSL_SHA1, |
522 | .algorithm_ssl = SSL_SSLV3, | 522 | .algorithm_ssl = SSL_SSLV3, |
523 | .algo_strength = SSL_HIGH|SSL_FIPS, | 523 | .algo_strength = SSL_HIGH, |
524 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 524 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
525 | .strength_bits = 112, | 525 | .strength_bits = 112, |
526 | .alg_bits = 168, | 526 | .alg_bits = 168, |
@@ -600,7 +600,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
600 | .algorithm_enc = SSL_3DES, | 600 | .algorithm_enc = SSL_3DES, |
601 | .algorithm_mac = SSL_SHA1, | 601 | .algorithm_mac = SSL_SHA1, |
602 | .algorithm_ssl = SSL_SSLV3, | 602 | .algorithm_ssl = SSL_SSLV3, |
603 | .algo_strength = SSL_HIGH|SSL_FIPS, | 603 | .algo_strength = SSL_HIGH, |
604 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 604 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
605 | .strength_bits = 112, | 605 | .strength_bits = 112, |
606 | .alg_bits = 168, | 606 | .alg_bits = 168, |
@@ -617,7 +617,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
617 | .algorithm_enc = SSL_AES128, | 617 | .algorithm_enc = SSL_AES128, |
618 | .algorithm_mac = SSL_SHA1, | 618 | .algorithm_mac = SSL_SHA1, |
619 | .algorithm_ssl = SSL_TLSV1, | 619 | .algorithm_ssl = SSL_TLSV1, |
620 | .algo_strength = SSL_HIGH|SSL_FIPS, | 620 | .algo_strength = SSL_HIGH, |
621 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 621 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
622 | .strength_bits = 128, | 622 | .strength_bits = 128, |
623 | .alg_bits = 128, | 623 | .alg_bits = 128, |
@@ -632,7 +632,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
632 | .algorithm_enc = SSL_AES128, | 632 | .algorithm_enc = SSL_AES128, |
633 | .algorithm_mac = SSL_SHA1, | 633 | .algorithm_mac = SSL_SHA1, |
634 | .algorithm_ssl = SSL_TLSV1, | 634 | .algorithm_ssl = SSL_TLSV1, |
635 | .algo_strength = SSL_HIGH|SSL_FIPS, | 635 | .algo_strength = SSL_HIGH, |
636 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 636 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
637 | .strength_bits = 128, | 637 | .strength_bits = 128, |
638 | .alg_bits = 128, | 638 | .alg_bits = 128, |
@@ -647,7 +647,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
647 | .algorithm_enc = SSL_AES128, | 647 | .algorithm_enc = SSL_AES128, |
648 | .algorithm_mac = SSL_SHA1, | 648 | .algorithm_mac = SSL_SHA1, |
649 | .algorithm_ssl = SSL_TLSV1, | 649 | .algorithm_ssl = SSL_TLSV1, |
650 | .algo_strength = SSL_HIGH|SSL_FIPS, | 650 | .algo_strength = SSL_HIGH, |
651 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 651 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
652 | .strength_bits = 128, | 652 | .strength_bits = 128, |
653 | .alg_bits = 128, | 653 | .alg_bits = 128, |
@@ -662,7 +662,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
662 | .algorithm_enc = SSL_AES128, | 662 | .algorithm_enc = SSL_AES128, |
663 | .algorithm_mac = SSL_SHA1, | 663 | .algorithm_mac = SSL_SHA1, |
664 | .algorithm_ssl = SSL_TLSV1, | 664 | .algorithm_ssl = SSL_TLSV1, |
665 | .algo_strength = SSL_HIGH|SSL_FIPS, | 665 | .algo_strength = SSL_HIGH, |
666 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 666 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
667 | .strength_bits = 128, | 667 | .strength_bits = 128, |
668 | .alg_bits = 128, | 668 | .alg_bits = 128, |
@@ -677,7 +677,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
677 | .algorithm_enc = SSL_AES128, | 677 | .algorithm_enc = SSL_AES128, |
678 | .algorithm_mac = SSL_SHA1, | 678 | .algorithm_mac = SSL_SHA1, |
679 | .algorithm_ssl = SSL_TLSV1, | 679 | .algorithm_ssl = SSL_TLSV1, |
680 | .algo_strength = SSL_HIGH|SSL_FIPS, | 680 | .algo_strength = SSL_HIGH, |
681 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 681 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
682 | .strength_bits = 128, | 682 | .strength_bits = 128, |
683 | .alg_bits = 128, | 683 | .alg_bits = 128, |
@@ -692,7 +692,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
692 | .algorithm_enc = SSL_AES128, | 692 | .algorithm_enc = SSL_AES128, |
693 | .algorithm_mac = SSL_SHA1, | 693 | .algorithm_mac = SSL_SHA1, |
694 | .algorithm_ssl = SSL_TLSV1, | 694 | .algorithm_ssl = SSL_TLSV1, |
695 | .algo_strength = SSL_HIGH|SSL_FIPS, | 695 | .algo_strength = SSL_HIGH, |
696 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 696 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
697 | .strength_bits = 128, | 697 | .strength_bits = 128, |
698 | .alg_bits = 128, | 698 | .alg_bits = 128, |
@@ -708,7 +708,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
708 | .algorithm_enc = SSL_AES256, | 708 | .algorithm_enc = SSL_AES256, |
709 | .algorithm_mac = SSL_SHA1, | 709 | .algorithm_mac = SSL_SHA1, |
710 | .algorithm_ssl = SSL_TLSV1, | 710 | .algorithm_ssl = SSL_TLSV1, |
711 | .algo_strength = SSL_HIGH|SSL_FIPS, | 711 | .algo_strength = SSL_HIGH, |
712 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 712 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
713 | .strength_bits = 256, | 713 | .strength_bits = 256, |
714 | .alg_bits = 256, | 714 | .alg_bits = 256, |
@@ -723,7 +723,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
723 | .algorithm_enc = SSL_AES256, | 723 | .algorithm_enc = SSL_AES256, |
724 | .algorithm_mac = SSL_SHA1, | 724 | .algorithm_mac = SSL_SHA1, |
725 | .algorithm_ssl = SSL_TLSV1, | 725 | .algorithm_ssl = SSL_TLSV1, |
726 | .algo_strength = SSL_HIGH|SSL_FIPS, | 726 | .algo_strength = SSL_HIGH, |
727 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 727 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
728 | .strength_bits = 256, | 728 | .strength_bits = 256, |
729 | .alg_bits = 256, | 729 | .alg_bits = 256, |
@@ -739,7 +739,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
739 | .algorithm_enc = SSL_AES256, | 739 | .algorithm_enc = SSL_AES256, |
740 | .algorithm_mac = SSL_SHA1, | 740 | .algorithm_mac = SSL_SHA1, |
741 | .algorithm_ssl = SSL_TLSV1, | 741 | .algorithm_ssl = SSL_TLSV1, |
742 | .algo_strength = SSL_HIGH|SSL_FIPS, | 742 | .algo_strength = SSL_HIGH, |
743 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 743 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
744 | .strength_bits = 256, | 744 | .strength_bits = 256, |
745 | .alg_bits = 256, | 745 | .alg_bits = 256, |
@@ -755,7 +755,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
755 | .algorithm_enc = SSL_AES256, | 755 | .algorithm_enc = SSL_AES256, |
756 | .algorithm_mac = SSL_SHA1, | 756 | .algorithm_mac = SSL_SHA1, |
757 | .algorithm_ssl = SSL_TLSV1, | 757 | .algorithm_ssl = SSL_TLSV1, |
758 | .algo_strength = SSL_HIGH|SSL_FIPS, | 758 | .algo_strength = SSL_HIGH, |
759 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 759 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
760 | .strength_bits = 256, | 760 | .strength_bits = 256, |
761 | .alg_bits = 256, | 761 | .alg_bits = 256, |
@@ -771,7 +771,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
771 | .algorithm_enc = SSL_AES256, | 771 | .algorithm_enc = SSL_AES256, |
772 | .algorithm_mac = SSL_SHA1, | 772 | .algorithm_mac = SSL_SHA1, |
773 | .algorithm_ssl = SSL_TLSV1, | 773 | .algorithm_ssl = SSL_TLSV1, |
774 | .algo_strength = SSL_HIGH|SSL_FIPS, | 774 | .algo_strength = SSL_HIGH, |
775 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 775 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
776 | .strength_bits = 256, | 776 | .strength_bits = 256, |
777 | .alg_bits = 256, | 777 | .alg_bits = 256, |
@@ -787,7 +787,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
787 | .algorithm_enc = SSL_AES256, | 787 | .algorithm_enc = SSL_AES256, |
788 | .algorithm_mac = SSL_SHA1, | 788 | .algorithm_mac = SSL_SHA1, |
789 | .algorithm_ssl = SSL_TLSV1, | 789 | .algorithm_ssl = SSL_TLSV1, |
790 | .algo_strength = SSL_HIGH|SSL_FIPS, | 790 | .algo_strength = SSL_HIGH, |
791 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 791 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
792 | .strength_bits = 256, | 792 | .strength_bits = 256, |
793 | .alg_bits = 256, | 793 | .alg_bits = 256, |
@@ -804,7 +804,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
804 | .algorithm_enc = SSL_eNULL, | 804 | .algorithm_enc = SSL_eNULL, |
805 | .algorithm_mac = SSL_SHA256, | 805 | .algorithm_mac = SSL_SHA256, |
806 | .algorithm_ssl = SSL_TLSV1_2, | 806 | .algorithm_ssl = SSL_TLSV1_2, |
807 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 807 | .algo_strength = SSL_STRONG_NONE, |
808 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 808 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
809 | .strength_bits = 0, | 809 | .strength_bits = 0, |
810 | .alg_bits = 0, | 810 | .alg_bits = 0, |
@@ -820,7 +820,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
820 | .algorithm_enc = SSL_AES128, | 820 | .algorithm_enc = SSL_AES128, |
821 | .algorithm_mac = SSL_SHA256, | 821 | .algorithm_mac = SSL_SHA256, |
822 | .algorithm_ssl = SSL_TLSV1_2, | 822 | .algorithm_ssl = SSL_TLSV1_2, |
823 | .algo_strength = SSL_HIGH|SSL_FIPS, | 823 | .algo_strength = SSL_HIGH, |
824 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 824 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
825 | .strength_bits = 128, | 825 | .strength_bits = 128, |
826 | .alg_bits = 128, | 826 | .alg_bits = 128, |
@@ -836,7 +836,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
836 | .algorithm_enc = SSL_AES256, | 836 | .algorithm_enc = SSL_AES256, |
837 | .algorithm_mac = SSL_SHA256, | 837 | .algorithm_mac = SSL_SHA256, |
838 | .algorithm_ssl = SSL_TLSV1_2, | 838 | .algorithm_ssl = SSL_TLSV1_2, |
839 | .algo_strength = SSL_HIGH|SSL_FIPS, | 839 | .algo_strength = SSL_HIGH, |
840 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 840 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
841 | .strength_bits = 256, | 841 | .strength_bits = 256, |
842 | .alg_bits = 256, | 842 | .alg_bits = 256, |
@@ -852,7 +852,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
852 | .algorithm_enc = SSL_AES128, | 852 | .algorithm_enc = SSL_AES128, |
853 | .algorithm_mac = SSL_SHA256, | 853 | .algorithm_mac = SSL_SHA256, |
854 | .algorithm_ssl = SSL_TLSV1_2, | 854 | .algorithm_ssl = SSL_TLSV1_2, |
855 | .algo_strength = SSL_HIGH|SSL_FIPS, | 855 | .algo_strength = SSL_HIGH, |
856 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 856 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
857 | .strength_bits = 128, | 857 | .strength_bits = 128, |
858 | .alg_bits = 128, | 858 | .alg_bits = 128, |
@@ -868,7 +868,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
868 | .algorithm_enc = SSL_AES128, | 868 | .algorithm_enc = SSL_AES128, |
869 | .algorithm_mac = SSL_SHA256, | 869 | .algorithm_mac = SSL_SHA256, |
870 | .algorithm_ssl = SSL_TLSV1_2, | 870 | .algorithm_ssl = SSL_TLSV1_2, |
871 | .algo_strength = SSL_HIGH|SSL_FIPS, | 871 | .algo_strength = SSL_HIGH, |
872 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 872 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
873 | .strength_bits = 128, | 873 | .strength_bits = 128, |
874 | .alg_bits = 128, | 874 | .alg_bits = 128, |
@@ -884,7 +884,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
884 | .algorithm_enc = SSL_AES128, | 884 | .algorithm_enc = SSL_AES128, |
885 | .algorithm_mac = SSL_SHA256, | 885 | .algorithm_mac = SSL_SHA256, |
886 | .algorithm_ssl = SSL_TLSV1_2, | 886 | .algorithm_ssl = SSL_TLSV1_2, |
887 | .algo_strength = SSL_HIGH|SSL_FIPS, | 887 | .algo_strength = SSL_HIGH, |
888 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 888 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
889 | .strength_bits = 128, | 889 | .strength_bits = 128, |
890 | .alg_bits = 128, | 890 | .alg_bits = 128, |
@@ -1001,7 +1001,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1001 | .algorithm_enc = SSL_AES128, | 1001 | .algorithm_enc = SSL_AES128, |
1002 | .algorithm_mac = SSL_SHA256, | 1002 | .algorithm_mac = SSL_SHA256, |
1003 | .algorithm_ssl = SSL_TLSV1_2, | 1003 | .algorithm_ssl = SSL_TLSV1_2, |
1004 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1004 | .algo_strength = SSL_HIGH, |
1005 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1005 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1006 | .strength_bits = 128, | 1006 | .strength_bits = 128, |
1007 | .alg_bits = 128, | 1007 | .alg_bits = 128, |
@@ -1017,7 +1017,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1017 | .algorithm_enc = SSL_AES256, | 1017 | .algorithm_enc = SSL_AES256, |
1018 | .algorithm_mac = SSL_SHA256, | 1018 | .algorithm_mac = SSL_SHA256, |
1019 | .algorithm_ssl = SSL_TLSV1_2, | 1019 | .algorithm_ssl = SSL_TLSV1_2, |
1020 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1020 | .algo_strength = SSL_HIGH, |
1021 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1021 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1022 | .strength_bits = 256, | 1022 | .strength_bits = 256, |
1023 | .alg_bits = 256, | 1023 | .alg_bits = 256, |
@@ -1033,7 +1033,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1033 | .algorithm_enc = SSL_AES256, | 1033 | .algorithm_enc = SSL_AES256, |
1034 | .algorithm_mac = SSL_SHA256, | 1034 | .algorithm_mac = SSL_SHA256, |
1035 | .algorithm_ssl = SSL_TLSV1_2, | 1035 | .algorithm_ssl = SSL_TLSV1_2, |
1036 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1036 | .algo_strength = SSL_HIGH, |
1037 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1037 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1038 | .strength_bits = 256, | 1038 | .strength_bits = 256, |
1039 | .alg_bits = 256, | 1039 | .alg_bits = 256, |
@@ -1049,7 +1049,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1049 | .algorithm_enc = SSL_AES256, | 1049 | .algorithm_enc = SSL_AES256, |
1050 | .algorithm_mac = SSL_SHA256, | 1050 | .algorithm_mac = SSL_SHA256, |
1051 | .algorithm_ssl = SSL_TLSV1_2, | 1051 | .algorithm_ssl = SSL_TLSV1_2, |
1052 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1052 | .algo_strength = SSL_HIGH, |
1053 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1053 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1054 | .strength_bits = 256, | 1054 | .strength_bits = 256, |
1055 | .alg_bits = 256, | 1055 | .alg_bits = 256, |
@@ -1065,7 +1065,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1065 | .algorithm_enc = SSL_AES256, | 1065 | .algorithm_enc = SSL_AES256, |
1066 | .algorithm_mac = SSL_SHA256, | 1066 | .algorithm_mac = SSL_SHA256, |
1067 | .algorithm_ssl = SSL_TLSV1_2, | 1067 | .algorithm_ssl = SSL_TLSV1_2, |
1068 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1068 | .algo_strength = SSL_HIGH, |
1069 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1069 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1070 | .strength_bits = 256, | 1070 | .strength_bits = 256, |
1071 | .alg_bits = 256, | 1071 | .alg_bits = 256, |
@@ -1081,7 +1081,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1081 | .algorithm_enc = SSL_AES128, | 1081 | .algorithm_enc = SSL_AES128, |
1082 | .algorithm_mac = SSL_SHA256, | 1082 | .algorithm_mac = SSL_SHA256, |
1083 | .algorithm_ssl = SSL_TLSV1_2, | 1083 | .algorithm_ssl = SSL_TLSV1_2, |
1084 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1084 | .algo_strength = SSL_HIGH, |
1085 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1085 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1086 | .strength_bits = 128, | 1086 | .strength_bits = 128, |
1087 | .alg_bits = 128, | 1087 | .alg_bits = 128, |
@@ -1097,7 +1097,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1097 | .algorithm_enc = SSL_AES256, | 1097 | .algorithm_enc = SSL_AES256, |
1098 | .algorithm_mac = SSL_SHA256, | 1098 | .algorithm_mac = SSL_SHA256, |
1099 | .algorithm_ssl = SSL_TLSV1_2, | 1099 | .algorithm_ssl = SSL_TLSV1_2, |
1100 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1100 | .algo_strength = SSL_HIGH, |
1101 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1101 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1102 | .strength_bits = 256, | 1102 | .strength_bits = 256, |
1103 | .alg_bits = 256, | 1103 | .alg_bits = 256, |
@@ -1291,7 +1291,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1291 | .algorithm_enc = SSL_3DES, | 1291 | .algorithm_enc = SSL_3DES, |
1292 | .algorithm_mac = SSL_SHA1, | 1292 | .algorithm_mac = SSL_SHA1, |
1293 | .algorithm_ssl = SSL_TLSV1, | 1293 | .algorithm_ssl = SSL_TLSV1, |
1294 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1294 | .algo_strength = SSL_HIGH, |
1295 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1295 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1296 | .strength_bits = 112, | 1296 | .strength_bits = 112, |
1297 | .alg_bits = 168, | 1297 | .alg_bits = 168, |
@@ -1307,7 +1307,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1307 | .algorithm_enc = SSL_AES128, | 1307 | .algorithm_enc = SSL_AES128, |
1308 | .algorithm_mac = SSL_SHA1, | 1308 | .algorithm_mac = SSL_SHA1, |
1309 | .algorithm_ssl = SSL_TLSV1, | 1309 | .algorithm_ssl = SSL_TLSV1, |
1310 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1310 | .algo_strength = SSL_HIGH, |
1311 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1311 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1312 | .strength_bits = 128, | 1312 | .strength_bits = 128, |
1313 | .alg_bits = 128, | 1313 | .alg_bits = 128, |
@@ -1323,7 +1323,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1323 | .algorithm_enc = SSL_AES256, | 1323 | .algorithm_enc = SSL_AES256, |
1324 | .algorithm_mac = SSL_SHA1, | 1324 | .algorithm_mac = SSL_SHA1, |
1325 | .algorithm_ssl = SSL_TLSV1, | 1325 | .algorithm_ssl = SSL_TLSV1, |
1326 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1326 | .algo_strength = SSL_HIGH, |
1327 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1327 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1328 | .strength_bits = 256, | 1328 | .strength_bits = 256, |
1329 | .alg_bits = 256, | 1329 | .alg_bits = 256, |
@@ -1342,7 +1342,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1342 | .algorithm_enc = SSL_AES128GCM, | 1342 | .algorithm_enc = SSL_AES128GCM, |
1343 | .algorithm_mac = SSL_AEAD, | 1343 | .algorithm_mac = SSL_AEAD, |
1344 | .algorithm_ssl = SSL_TLSV1_2, | 1344 | .algorithm_ssl = SSL_TLSV1_2, |
1345 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1345 | .algo_strength = SSL_HIGH, |
1346 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1346 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1347 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1347 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1348 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1348 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1360,7 +1360,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1360 | .algorithm_enc = SSL_AES256GCM, | 1360 | .algorithm_enc = SSL_AES256GCM, |
1361 | .algorithm_mac = SSL_AEAD, | 1361 | .algorithm_mac = SSL_AEAD, |
1362 | .algorithm_ssl = SSL_TLSV1_2, | 1362 | .algorithm_ssl = SSL_TLSV1_2, |
1363 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1363 | .algo_strength = SSL_HIGH, |
1364 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1364 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1365 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1365 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1366 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1366 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1378,7 +1378,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1378 | .algorithm_enc = SSL_AES128GCM, | 1378 | .algorithm_enc = SSL_AES128GCM, |
1379 | .algorithm_mac = SSL_AEAD, | 1379 | .algorithm_mac = SSL_AEAD, |
1380 | .algorithm_ssl = SSL_TLSV1_2, | 1380 | .algorithm_ssl = SSL_TLSV1_2, |
1381 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1381 | .algo_strength = SSL_HIGH, |
1382 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1382 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1383 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1383 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1384 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1384 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1396,7 +1396,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1396 | .algorithm_enc = SSL_AES256GCM, | 1396 | .algorithm_enc = SSL_AES256GCM, |
1397 | .algorithm_mac = SSL_AEAD, | 1397 | .algorithm_mac = SSL_AEAD, |
1398 | .algorithm_ssl = SSL_TLSV1_2, | 1398 | .algorithm_ssl = SSL_TLSV1_2, |
1399 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1399 | .algo_strength = SSL_HIGH, |
1400 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1400 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1401 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1401 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1402 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1402 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1414,7 +1414,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1414 | .algorithm_enc = SSL_AES128GCM, | 1414 | .algorithm_enc = SSL_AES128GCM, |
1415 | .algorithm_mac = SSL_AEAD, | 1415 | .algorithm_mac = SSL_AEAD, |
1416 | .algorithm_ssl = SSL_TLSV1_2, | 1416 | .algorithm_ssl = SSL_TLSV1_2, |
1417 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1417 | .algo_strength = SSL_HIGH, |
1418 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1418 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1419 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1419 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1420 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1420 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1432,7 +1432,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1432 | .algorithm_enc = SSL_AES256GCM, | 1432 | .algorithm_enc = SSL_AES256GCM, |
1433 | .algorithm_mac = SSL_AEAD, | 1433 | .algorithm_mac = SSL_AEAD, |
1434 | .algorithm_ssl = SSL_TLSV1_2, | 1434 | .algorithm_ssl = SSL_TLSV1_2, |
1435 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1435 | .algo_strength = SSL_HIGH, |
1436 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1436 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1437 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1437 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1438 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1438 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1450,7 +1450,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1450 | .algorithm_enc = SSL_AES128GCM, | 1450 | .algorithm_enc = SSL_AES128GCM, |
1451 | .algorithm_mac = SSL_AEAD, | 1451 | .algorithm_mac = SSL_AEAD, |
1452 | .algorithm_ssl = SSL_TLSV1_2, | 1452 | .algorithm_ssl = SSL_TLSV1_2, |
1453 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1453 | .algo_strength = SSL_HIGH, |
1454 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1454 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1455 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1455 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1456 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1456 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1468,7 +1468,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1468 | .algorithm_enc = SSL_AES256GCM, | 1468 | .algorithm_enc = SSL_AES256GCM, |
1469 | .algorithm_mac = SSL_AEAD, | 1469 | .algorithm_mac = SSL_AEAD, |
1470 | .algorithm_ssl = SSL_TLSV1_2, | 1470 | .algorithm_ssl = SSL_TLSV1_2, |
1471 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1471 | .algo_strength = SSL_HIGH, |
1472 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1472 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1473 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1473 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1474 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1474 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1486,7 +1486,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1486 | .algorithm_enc = SSL_AES128GCM, | 1486 | .algorithm_enc = SSL_AES128GCM, |
1487 | .algorithm_mac = SSL_AEAD, | 1487 | .algorithm_mac = SSL_AEAD, |
1488 | .algorithm_ssl = SSL_TLSV1_2, | 1488 | .algorithm_ssl = SSL_TLSV1_2, |
1489 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1489 | .algo_strength = SSL_HIGH, |
1490 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1490 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1491 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1491 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1492 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1492 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1504,7 +1504,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1504 | .algorithm_enc = SSL_AES256GCM, | 1504 | .algorithm_enc = SSL_AES256GCM, |
1505 | .algorithm_mac = SSL_AEAD, | 1505 | .algorithm_mac = SSL_AEAD, |
1506 | .algorithm_ssl = SSL_TLSV1_2, | 1506 | .algorithm_ssl = SSL_TLSV1_2, |
1507 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1507 | .algo_strength = SSL_HIGH, |
1508 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1508 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1509 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1509 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1510 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1510 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1522,7 +1522,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1522 | .algorithm_enc = SSL_AES128GCM, | 1522 | .algorithm_enc = SSL_AES128GCM, |
1523 | .algorithm_mac = SSL_AEAD, | 1523 | .algorithm_mac = SSL_AEAD, |
1524 | .algorithm_ssl = SSL_TLSV1_2, | 1524 | .algorithm_ssl = SSL_TLSV1_2, |
1525 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1525 | .algo_strength = SSL_HIGH, |
1526 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 1526 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
1527 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1527 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1528 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1528 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1540,7 +1540,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1540 | .algorithm_enc = SSL_AES256GCM, | 1540 | .algorithm_enc = SSL_AES256GCM, |
1541 | .algorithm_mac = SSL_AEAD, | 1541 | .algorithm_mac = SSL_AEAD, |
1542 | .algorithm_ssl = SSL_TLSV1_2, | 1542 | .algorithm_ssl = SSL_TLSV1_2, |
1543 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1543 | .algo_strength = SSL_HIGH, |
1544 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 1544 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
1545 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 1545 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
1546 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 1546 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -1558,7 +1558,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1558 | .algorithm_enc = SSL_eNULL, | 1558 | .algorithm_enc = SSL_eNULL, |
1559 | .algorithm_mac = SSL_SHA1, | 1559 | .algorithm_mac = SSL_SHA1, |
1560 | .algorithm_ssl = SSL_TLSV1, | 1560 | .algorithm_ssl = SSL_TLSV1, |
1561 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1561 | .algo_strength = SSL_STRONG_NONE, |
1562 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1562 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1563 | .strength_bits = 0, | 1563 | .strength_bits = 0, |
1564 | .alg_bits = 0, | 1564 | .alg_bits = 0, |
@@ -1590,7 +1590,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1590 | .algorithm_enc = SSL_3DES, | 1590 | .algorithm_enc = SSL_3DES, |
1591 | .algorithm_mac = SSL_SHA1, | 1591 | .algorithm_mac = SSL_SHA1, |
1592 | .algorithm_ssl = SSL_TLSV1, | 1592 | .algorithm_ssl = SSL_TLSV1, |
1593 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1593 | .algo_strength = SSL_HIGH, |
1594 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1594 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1595 | .strength_bits = 112, | 1595 | .strength_bits = 112, |
1596 | .alg_bits = 168, | 1596 | .alg_bits = 168, |
@@ -1606,7 +1606,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1606 | .algorithm_enc = SSL_AES128, | 1606 | .algorithm_enc = SSL_AES128, |
1607 | .algorithm_mac = SSL_SHA1, | 1607 | .algorithm_mac = SSL_SHA1, |
1608 | .algorithm_ssl = SSL_TLSV1, | 1608 | .algorithm_ssl = SSL_TLSV1, |
1609 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1609 | .algo_strength = SSL_HIGH, |
1610 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1610 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1611 | .strength_bits = 128, | 1611 | .strength_bits = 128, |
1612 | .alg_bits = 128, | 1612 | .alg_bits = 128, |
@@ -1622,7 +1622,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1622 | .algorithm_enc = SSL_AES256, | 1622 | .algorithm_enc = SSL_AES256, |
1623 | .algorithm_mac = SSL_SHA1, | 1623 | .algorithm_mac = SSL_SHA1, |
1624 | .algorithm_ssl = SSL_TLSV1, | 1624 | .algorithm_ssl = SSL_TLSV1, |
1625 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1625 | .algo_strength = SSL_HIGH, |
1626 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1626 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1627 | .strength_bits = 256, | 1627 | .strength_bits = 256, |
1628 | .alg_bits = 256, | 1628 | .alg_bits = 256, |
@@ -1638,7 +1638,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1638 | .algorithm_enc = SSL_eNULL, | 1638 | .algorithm_enc = SSL_eNULL, |
1639 | .algorithm_mac = SSL_SHA1, | 1639 | .algorithm_mac = SSL_SHA1, |
1640 | .algorithm_ssl = SSL_TLSV1, | 1640 | .algorithm_ssl = SSL_TLSV1, |
1641 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1641 | .algo_strength = SSL_STRONG_NONE, |
1642 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1642 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1643 | .strength_bits = 0, | 1643 | .strength_bits = 0, |
1644 | .alg_bits = 0, | 1644 | .alg_bits = 0, |
@@ -1670,7 +1670,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1670 | .algorithm_enc = SSL_3DES, | 1670 | .algorithm_enc = SSL_3DES, |
1671 | .algorithm_mac = SSL_SHA1, | 1671 | .algorithm_mac = SSL_SHA1, |
1672 | .algorithm_ssl = SSL_TLSV1, | 1672 | .algorithm_ssl = SSL_TLSV1, |
1673 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1673 | .algo_strength = SSL_HIGH, |
1674 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1674 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1675 | .strength_bits = 112, | 1675 | .strength_bits = 112, |
1676 | .alg_bits = 168, | 1676 | .alg_bits = 168, |
@@ -1686,7 +1686,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1686 | .algorithm_enc = SSL_AES128, | 1686 | .algorithm_enc = SSL_AES128, |
1687 | .algorithm_mac = SSL_SHA1, | 1687 | .algorithm_mac = SSL_SHA1, |
1688 | .algorithm_ssl = SSL_TLSV1, | 1688 | .algorithm_ssl = SSL_TLSV1, |
1689 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1689 | .algo_strength = SSL_HIGH, |
1690 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1690 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1691 | .strength_bits = 128, | 1691 | .strength_bits = 128, |
1692 | .alg_bits = 128, | 1692 | .alg_bits = 128, |
@@ -1702,7 +1702,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1702 | .algorithm_enc = SSL_AES256, | 1702 | .algorithm_enc = SSL_AES256, |
1703 | .algorithm_mac = SSL_SHA1, | 1703 | .algorithm_mac = SSL_SHA1, |
1704 | .algorithm_ssl = SSL_TLSV1, | 1704 | .algorithm_ssl = SSL_TLSV1, |
1705 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1705 | .algo_strength = SSL_HIGH, |
1706 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1706 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1707 | .strength_bits = 256, | 1707 | .strength_bits = 256, |
1708 | .alg_bits = 256, | 1708 | .alg_bits = 256, |
@@ -1718,7 +1718,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1718 | .algorithm_enc = SSL_eNULL, | 1718 | .algorithm_enc = SSL_eNULL, |
1719 | .algorithm_mac = SSL_SHA1, | 1719 | .algorithm_mac = SSL_SHA1, |
1720 | .algorithm_ssl = SSL_TLSV1, | 1720 | .algorithm_ssl = SSL_TLSV1, |
1721 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1721 | .algo_strength = SSL_STRONG_NONE, |
1722 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1722 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1723 | .strength_bits = 0, | 1723 | .strength_bits = 0, |
1724 | .alg_bits = 0, | 1724 | .alg_bits = 0, |
@@ -1750,7 +1750,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1750 | .algorithm_enc = SSL_3DES, | 1750 | .algorithm_enc = SSL_3DES, |
1751 | .algorithm_mac = SSL_SHA1, | 1751 | .algorithm_mac = SSL_SHA1, |
1752 | .algorithm_ssl = SSL_TLSV1, | 1752 | .algorithm_ssl = SSL_TLSV1, |
1753 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1753 | .algo_strength = SSL_HIGH, |
1754 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1754 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1755 | .strength_bits = 112, | 1755 | .strength_bits = 112, |
1756 | .alg_bits = 168, | 1756 | .alg_bits = 168, |
@@ -1766,7 +1766,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1766 | .algorithm_enc = SSL_AES128, | 1766 | .algorithm_enc = SSL_AES128, |
1767 | .algorithm_mac = SSL_SHA1, | 1767 | .algorithm_mac = SSL_SHA1, |
1768 | .algorithm_ssl = SSL_TLSV1, | 1768 | .algorithm_ssl = SSL_TLSV1, |
1769 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1769 | .algo_strength = SSL_HIGH, |
1770 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1770 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1771 | .strength_bits = 128, | 1771 | .strength_bits = 128, |
1772 | .alg_bits = 128, | 1772 | .alg_bits = 128, |
@@ -1782,7 +1782,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1782 | .algorithm_enc = SSL_AES256, | 1782 | .algorithm_enc = SSL_AES256, |
1783 | .algorithm_mac = SSL_SHA1, | 1783 | .algorithm_mac = SSL_SHA1, |
1784 | .algorithm_ssl = SSL_TLSV1, | 1784 | .algorithm_ssl = SSL_TLSV1, |
1785 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1785 | .algo_strength = SSL_HIGH, |
1786 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1786 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1787 | .strength_bits = 256, | 1787 | .strength_bits = 256, |
1788 | .alg_bits = 256, | 1788 | .alg_bits = 256, |
@@ -1798,7 +1798,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1798 | .algorithm_enc = SSL_eNULL, | 1798 | .algorithm_enc = SSL_eNULL, |
1799 | .algorithm_mac = SSL_SHA1, | 1799 | .algorithm_mac = SSL_SHA1, |
1800 | .algorithm_ssl = SSL_TLSV1, | 1800 | .algorithm_ssl = SSL_TLSV1, |
1801 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1801 | .algo_strength = SSL_STRONG_NONE, |
1802 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1802 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1803 | .strength_bits = 0, | 1803 | .strength_bits = 0, |
1804 | .alg_bits = 0, | 1804 | .alg_bits = 0, |
@@ -1830,7 +1830,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1830 | .algorithm_enc = SSL_3DES, | 1830 | .algorithm_enc = SSL_3DES, |
1831 | .algorithm_mac = SSL_SHA1, | 1831 | .algorithm_mac = SSL_SHA1, |
1832 | .algorithm_ssl = SSL_TLSV1, | 1832 | .algorithm_ssl = SSL_TLSV1, |
1833 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1833 | .algo_strength = SSL_HIGH, |
1834 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1834 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1835 | .strength_bits = 112, | 1835 | .strength_bits = 112, |
1836 | .alg_bits = 168, | 1836 | .alg_bits = 168, |
@@ -1846,7 +1846,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1846 | .algorithm_enc = SSL_AES128, | 1846 | .algorithm_enc = SSL_AES128, |
1847 | .algorithm_mac = SSL_SHA1, | 1847 | .algorithm_mac = SSL_SHA1, |
1848 | .algorithm_ssl = SSL_TLSV1, | 1848 | .algorithm_ssl = SSL_TLSV1, |
1849 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1849 | .algo_strength = SSL_HIGH, |
1850 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1850 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1851 | .strength_bits = 128, | 1851 | .strength_bits = 128, |
1852 | .alg_bits = 128, | 1852 | .alg_bits = 128, |
@@ -1862,7 +1862,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1862 | .algorithm_enc = SSL_AES256, | 1862 | .algorithm_enc = SSL_AES256, |
1863 | .algorithm_mac = SSL_SHA1, | 1863 | .algorithm_mac = SSL_SHA1, |
1864 | .algorithm_ssl = SSL_TLSV1, | 1864 | .algorithm_ssl = SSL_TLSV1, |
1865 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1865 | .algo_strength = SSL_HIGH, |
1866 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1866 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1867 | .strength_bits = 256, | 1867 | .strength_bits = 256, |
1868 | .alg_bits = 256, | 1868 | .alg_bits = 256, |
@@ -1878,7 +1878,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1878 | .algorithm_enc = SSL_eNULL, | 1878 | .algorithm_enc = SSL_eNULL, |
1879 | .algorithm_mac = SSL_SHA1, | 1879 | .algorithm_mac = SSL_SHA1, |
1880 | .algorithm_ssl = SSL_TLSV1, | 1880 | .algorithm_ssl = SSL_TLSV1, |
1881 | .algo_strength = SSL_STRONG_NONE|SSL_FIPS, | 1881 | .algo_strength = SSL_STRONG_NONE, |
1882 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1882 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1883 | .strength_bits = 0, | 1883 | .strength_bits = 0, |
1884 | .alg_bits = 0, | 1884 | .alg_bits = 0, |
@@ -1910,7 +1910,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1910 | .algorithm_enc = SSL_3DES, | 1910 | .algorithm_enc = SSL_3DES, |
1911 | .algorithm_mac = SSL_SHA1, | 1911 | .algorithm_mac = SSL_SHA1, |
1912 | .algorithm_ssl = SSL_TLSV1, | 1912 | .algorithm_ssl = SSL_TLSV1, |
1913 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1913 | .algo_strength = SSL_HIGH, |
1914 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1914 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1915 | .strength_bits = 112, | 1915 | .strength_bits = 112, |
1916 | .alg_bits = 168, | 1916 | .alg_bits = 168, |
@@ -1926,7 +1926,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1926 | .algorithm_enc = SSL_AES128, | 1926 | .algorithm_enc = SSL_AES128, |
1927 | .algorithm_mac = SSL_SHA1, | 1927 | .algorithm_mac = SSL_SHA1, |
1928 | .algorithm_ssl = SSL_TLSV1, | 1928 | .algorithm_ssl = SSL_TLSV1, |
1929 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1929 | .algo_strength = SSL_HIGH, |
1930 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1930 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1931 | .strength_bits = 128, | 1931 | .strength_bits = 128, |
1932 | .alg_bits = 128, | 1932 | .alg_bits = 128, |
@@ -1942,7 +1942,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1942 | .algorithm_enc = SSL_AES256, | 1942 | .algorithm_enc = SSL_AES256, |
1943 | .algorithm_mac = SSL_SHA1, | 1943 | .algorithm_mac = SSL_SHA1, |
1944 | .algorithm_ssl = SSL_TLSV1, | 1944 | .algorithm_ssl = SSL_TLSV1, |
1945 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1945 | .algo_strength = SSL_HIGH, |
1946 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, | 1946 | .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, |
1947 | .strength_bits = 256, | 1947 | .strength_bits = 256, |
1948 | .alg_bits = 256, | 1948 | .alg_bits = 256, |
@@ -1961,7 +1961,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1961 | .algorithm_enc = SSL_AES128, | 1961 | .algorithm_enc = SSL_AES128, |
1962 | .algorithm_mac = SSL_SHA256, | 1962 | .algorithm_mac = SSL_SHA256, |
1963 | .algorithm_ssl = SSL_TLSV1_2, | 1963 | .algorithm_ssl = SSL_TLSV1_2, |
1964 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1964 | .algo_strength = SSL_HIGH, |
1965 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 1965 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
1966 | .strength_bits = 128, | 1966 | .strength_bits = 128, |
1967 | .alg_bits = 128, | 1967 | .alg_bits = 128, |
@@ -1977,7 +1977,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1977 | .algorithm_enc = SSL_AES256, | 1977 | .algorithm_enc = SSL_AES256, |
1978 | .algorithm_mac = SSL_SHA384, | 1978 | .algorithm_mac = SSL_SHA384, |
1979 | .algorithm_ssl = SSL_TLSV1_2, | 1979 | .algorithm_ssl = SSL_TLSV1_2, |
1980 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1980 | .algo_strength = SSL_HIGH, |
1981 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 1981 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
1982 | .strength_bits = 256, | 1982 | .strength_bits = 256, |
1983 | .alg_bits = 256, | 1983 | .alg_bits = 256, |
@@ -1993,7 +1993,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
1993 | .algorithm_enc = SSL_AES128, | 1993 | .algorithm_enc = SSL_AES128, |
1994 | .algorithm_mac = SSL_SHA256, | 1994 | .algorithm_mac = SSL_SHA256, |
1995 | .algorithm_ssl = SSL_TLSV1_2, | 1995 | .algorithm_ssl = SSL_TLSV1_2, |
1996 | .algo_strength = SSL_HIGH|SSL_FIPS, | 1996 | .algo_strength = SSL_HIGH, |
1997 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 1997 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
1998 | .strength_bits = 128, | 1998 | .strength_bits = 128, |
1999 | .alg_bits = 128, | 1999 | .alg_bits = 128, |
@@ -2009,7 +2009,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2009 | .algorithm_enc = SSL_AES256, | 2009 | .algorithm_enc = SSL_AES256, |
2010 | .algorithm_mac = SSL_SHA384, | 2010 | .algorithm_mac = SSL_SHA384, |
2011 | .algorithm_ssl = SSL_TLSV1_2, | 2011 | .algorithm_ssl = SSL_TLSV1_2, |
2012 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2012 | .algo_strength = SSL_HIGH, |
2013 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 2013 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
2014 | .strength_bits = 256, | 2014 | .strength_bits = 256, |
2015 | .alg_bits = 256, | 2015 | .alg_bits = 256, |
@@ -2025,7 +2025,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2025 | .algorithm_enc = SSL_AES128, | 2025 | .algorithm_enc = SSL_AES128, |
2026 | .algorithm_mac = SSL_SHA256, | 2026 | .algorithm_mac = SSL_SHA256, |
2027 | .algorithm_ssl = SSL_TLSV1_2, | 2027 | .algorithm_ssl = SSL_TLSV1_2, |
2028 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2028 | .algo_strength = SSL_HIGH, |
2029 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 2029 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
2030 | .strength_bits = 128, | 2030 | .strength_bits = 128, |
2031 | .alg_bits = 128, | 2031 | .alg_bits = 128, |
@@ -2041,7 +2041,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2041 | .algorithm_enc = SSL_AES256, | 2041 | .algorithm_enc = SSL_AES256, |
2042 | .algorithm_mac = SSL_SHA384, | 2042 | .algorithm_mac = SSL_SHA384, |
2043 | .algorithm_ssl = SSL_TLSV1_2, | 2043 | .algorithm_ssl = SSL_TLSV1_2, |
2044 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2044 | .algo_strength = SSL_HIGH, |
2045 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 2045 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
2046 | .strength_bits = 256, | 2046 | .strength_bits = 256, |
2047 | .alg_bits = 256, | 2047 | .alg_bits = 256, |
@@ -2057,7 +2057,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2057 | .algorithm_enc = SSL_AES128, | 2057 | .algorithm_enc = SSL_AES128, |
2058 | .algorithm_mac = SSL_SHA256, | 2058 | .algorithm_mac = SSL_SHA256, |
2059 | .algorithm_ssl = SSL_TLSV1_2, | 2059 | .algorithm_ssl = SSL_TLSV1_2, |
2060 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2060 | .algo_strength = SSL_HIGH, |
2061 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, | 2061 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, |
2062 | .strength_bits = 128, | 2062 | .strength_bits = 128, |
2063 | .alg_bits = 128, | 2063 | .alg_bits = 128, |
@@ -2073,7 +2073,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2073 | .algorithm_enc = SSL_AES256, | 2073 | .algorithm_enc = SSL_AES256, |
2074 | .algorithm_mac = SSL_SHA384, | 2074 | .algorithm_mac = SSL_SHA384, |
2075 | .algorithm_ssl = SSL_TLSV1_2, | 2075 | .algorithm_ssl = SSL_TLSV1_2, |
2076 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2076 | .algo_strength = SSL_HIGH, |
2077 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, | 2077 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, |
2078 | .strength_bits = 256, | 2078 | .strength_bits = 256, |
2079 | .alg_bits = 256, | 2079 | .alg_bits = 256, |
@@ -2091,7 +2091,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2091 | .algorithm_enc = SSL_AES128GCM, | 2091 | .algorithm_enc = SSL_AES128GCM, |
2092 | .algorithm_mac = SSL_AEAD, | 2092 | .algorithm_mac = SSL_AEAD, |
2093 | .algorithm_ssl = SSL_TLSV1_2, | 2093 | .algorithm_ssl = SSL_TLSV1_2, |
2094 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2094 | .algo_strength = SSL_HIGH, |
2095 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2095 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2096 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2096 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2097 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2097 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2109,7 +2109,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2109 | .algorithm_enc = SSL_AES256GCM, | 2109 | .algorithm_enc = SSL_AES256GCM, |
2110 | .algorithm_mac = SSL_AEAD, | 2110 | .algorithm_mac = SSL_AEAD, |
2111 | .algorithm_ssl = SSL_TLSV1_2, | 2111 | .algorithm_ssl = SSL_TLSV1_2, |
2112 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2112 | .algo_strength = SSL_HIGH, |
2113 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2113 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2114 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2114 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2115 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2115 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2127,7 +2127,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2127 | .algorithm_enc = SSL_AES128GCM, | 2127 | .algorithm_enc = SSL_AES128GCM, |
2128 | .algorithm_mac = SSL_AEAD, | 2128 | .algorithm_mac = SSL_AEAD, |
2129 | .algorithm_ssl = SSL_TLSV1_2, | 2129 | .algorithm_ssl = SSL_TLSV1_2, |
2130 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2130 | .algo_strength = SSL_HIGH, |
2131 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2131 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2132 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2132 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2133 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2133 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2145,7 +2145,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2145 | .algorithm_enc = SSL_AES256GCM, | 2145 | .algorithm_enc = SSL_AES256GCM, |
2146 | .algorithm_mac = SSL_AEAD, | 2146 | .algorithm_mac = SSL_AEAD, |
2147 | .algorithm_ssl = SSL_TLSV1_2, | 2147 | .algorithm_ssl = SSL_TLSV1_2, |
2148 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2148 | .algo_strength = SSL_HIGH, |
2149 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2149 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2150 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2150 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2151 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2151 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2163,7 +2163,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2163 | .algorithm_enc = SSL_AES128GCM, | 2163 | .algorithm_enc = SSL_AES128GCM, |
2164 | .algorithm_mac = SSL_AEAD, | 2164 | .algorithm_mac = SSL_AEAD, |
2165 | .algorithm_ssl = SSL_TLSV1_2, | 2165 | .algorithm_ssl = SSL_TLSV1_2, |
2166 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2166 | .algo_strength = SSL_HIGH, |
2167 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2167 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2168 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2168 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2169 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2169 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2181,7 +2181,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2181 | .algorithm_enc = SSL_AES256GCM, | 2181 | .algorithm_enc = SSL_AES256GCM, |
2182 | .algorithm_mac = SSL_AEAD, | 2182 | .algorithm_mac = SSL_AEAD, |
2183 | .algorithm_ssl = SSL_TLSV1_2, | 2183 | .algorithm_ssl = SSL_TLSV1_2, |
2184 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2184 | .algo_strength = SSL_HIGH, |
2185 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2185 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2186 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2186 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2187 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2187 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2199,7 +2199,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2199 | .algorithm_enc = SSL_AES128GCM, | 2199 | .algorithm_enc = SSL_AES128GCM, |
2200 | .algorithm_mac = SSL_AEAD, | 2200 | .algorithm_mac = SSL_AEAD, |
2201 | .algorithm_ssl = SSL_TLSV1_2, | 2201 | .algorithm_ssl = SSL_TLSV1_2, |
2202 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2202 | .algo_strength = SSL_HIGH, |
2203 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| | 2203 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256| |
2204 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2204 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2205 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2205 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
@@ -2217,7 +2217,7 @@ SSL_CIPHER ssl3_ciphers[] = { | |||
2217 | .algorithm_enc = SSL_AES256GCM, | 2217 | .algorithm_enc = SSL_AES256GCM, |
2218 | .algorithm_mac = SSL_AEAD, | 2218 | .algorithm_mac = SSL_AEAD, |
2219 | .algorithm_ssl = SSL_TLSV1_2, | 2219 | .algorithm_ssl = SSL_TLSV1_2, |
2220 | .algo_strength = SSL_HIGH|SSL_FIPS, | 2220 | .algo_strength = SSL_HIGH, |
2221 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| | 2221 | .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| |
2222 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| | 2222 | SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| |
2223 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, | 2223 | SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c index b8a6eaf514..31964ebe14 100644 --- a/src/lib/libssl/src/ssl/ssl_ciph.c +++ b/src/lib/libssl/src/ssl/ssl_ciph.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_ciph.c,v 1.55 2014/06/18 04:48:37 miod Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.56 2014/07/08 21:50:40 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -557,13 +557,6 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
557 | .name = SSL_TXT_HIGH, | 557 | .name = SSL_TXT_HIGH, |
558 | .algo_strength = SSL_HIGH, | 558 | .algo_strength = SSL_HIGH, |
559 | }, | 559 | }, |
560 | |||
561 | /* FIPS 140-2 approved ciphersuite */ | ||
562 | { | ||
563 | .name = SSL_TXT_FIPS, | ||
564 | .algorithm_enc = ~SSL_eNULL, | ||
565 | .algo_strength = SSL_FIPS, | ||
566 | }, | ||
567 | }; | 560 | }; |
568 | 561 | ||
569 | /* Search for public key algorithm with given name and | 562 | /* Search for public key algorithm with given name and |
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h index 0b2551be20..228bf5b2be 100644 --- a/src/lib/libssl/src/ssl/ssl_locl.h +++ b/src/lib/libssl/src/ssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.54 2014/07/08 21:31:54 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.55 2014/07/08 21:50:40 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -395,7 +395,6 @@ | |||
395 | #define SSL_LOW 0x00000020L | 395 | #define SSL_LOW 0x00000020L |
396 | #define SSL_MEDIUM 0x00000040L | 396 | #define SSL_MEDIUM 0x00000040L |
397 | #define SSL_HIGH 0x00000080L | 397 | #define SSL_HIGH 0x00000080L |
398 | #define SSL_FIPS 0x00000100L | ||
399 | 398 | ||
400 | /* we have used 000001ff - 23 bits left to go */ | 399 | /* we have used 000001ff - 23 bits left to go */ |
401 | 400 | ||
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index b8a6eaf514..31964ebe14 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_ciph.c,v 1.55 2014/06/18 04:48:37 miod Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.56 2014/07/08 21:50:40 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -557,13 +557,6 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
557 | .name = SSL_TXT_HIGH, | 557 | .name = SSL_TXT_HIGH, |
558 | .algo_strength = SSL_HIGH, | 558 | .algo_strength = SSL_HIGH, |
559 | }, | 559 | }, |
560 | |||
561 | /* FIPS 140-2 approved ciphersuite */ | ||
562 | { | ||
563 | .name = SSL_TXT_FIPS, | ||
564 | .algorithm_enc = ~SSL_eNULL, | ||
565 | .algo_strength = SSL_FIPS, | ||
566 | }, | ||
567 | }; | 560 | }; |
568 | 561 | ||
569 | /* Search for public key algorithm with given name and | 562 | /* Search for public key algorithm with given name and |
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 0b2551be20..228bf5b2be 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.54 2014/07/08 21:31:54 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.55 2014/07/08 21:50:40 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -395,7 +395,6 @@ | |||
395 | #define SSL_LOW 0x00000020L | 395 | #define SSL_LOW 0x00000020L |
396 | #define SSL_MEDIUM 0x00000040L | 396 | #define SSL_MEDIUM 0x00000040L |
397 | #define SSL_HIGH 0x00000080L | 397 | #define SSL_HIGH 0x00000080L |
398 | #define SSL_FIPS 0x00000100L | ||
399 | 398 | ||
400 | /* we have used 000001ff - 23 bits left to go */ | 399 | /* we have used 000001ff - 23 bits left to go */ |
401 | 400 | ||