summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2014-08-10 14:57:04 +0000
committerjsing <>2014-08-10 14:57:04 +0000
commitca5dc2794c08960f4e1f0a1e7fc8968cff69a261 (patch)
tree7549ee0b3df3a3d6742e2e976b01bae4e7961378 /src/lib
parentcdc0e904c0db18d8a94dbc75555c41585f6a7867 (diff)
downloadopenbsd-ca5dc2794c08960f4e1f0a1e7fc8968cff69a261.tar.gz
openbsd-ca5dc2794c08960f4e1f0a1e7fc8968cff69a261.tar.bz2
openbsd-ca5dc2794c08960f4e1f0a1e7fc8968cff69a261.zip
Remove disabled (weakened export and non-ephemeral DH) cipher suites from
the cipher list. This reduces code size, saves data segment space and prevents them from being turned back on at runtime by flipping a bit in memory. ok guenther@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/s3_lib.c475
-rw-r--r--src/lib/libssl/src/ssl/s3_lib.c475
2 files changed, 10 insertions, 940 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 4631c517cc..e66f841df3 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.73 2014/08/07 20:02:23 miod Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.74 2014/08/10 14:57:04 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 *
@@ -200,22 +200,6 @@ SSL_CIPHER ssl3_ciphers[] = {
200 .alg_bits = 0, 200 .alg_bits = 0,
201 }, 201 },
202 202
203 /* Cipher 03 */
204 {
205 .valid = 0, /* Weakened 40-bit export cipher. */
206 .name = SSL3_TXT_RSA_RC4_40_MD5,
207 .id = SSL3_CK_RSA_RC4_40_MD5,
208 .algorithm_mkey = SSL_kRSA,
209 .algorithm_auth = SSL_aRSA,
210 .algorithm_enc = SSL_RC4,
211 .algorithm_mac = SSL_MD5,
212 .algorithm_ssl = SSL_SSLV3,
213 .algo_strength = 0,
214 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
215 .strength_bits = 40,
216 .alg_bits = 128,
217 },
218
219 /* Cipher 04 */ 203 /* Cipher 04 */
220 { 204 {
221 .valid = 1, 205 .valid = 1,
@@ -248,22 +232,6 @@ SSL_CIPHER ssl3_ciphers[] = {
248 .alg_bits = 128, 232 .alg_bits = 128,
249 }, 233 },
250 234
251 /* Cipher 06 */
252 {
253 .valid = 0, /* Weakened 40-bit export cipher. */
254 .name = SSL3_TXT_RSA_RC2_40_MD5,
255 .id = SSL3_CK_RSA_RC2_40_MD5,
256 .algorithm_mkey = SSL_kRSA,
257 .algorithm_auth = SSL_aRSA,
258 .algorithm_enc = SSL_RC2,
259 .algorithm_mac = SSL_MD5,
260 .algorithm_ssl = SSL_SSLV3,
261 .algo_strength = 0,
262 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
263 .strength_bits = 40,
264 .alg_bits = 128,
265 },
266
267 /* Cipher 07 */ 235 /* Cipher 07 */
268#ifndef OPENSSL_NO_IDEA 236#ifndef OPENSSL_NO_IDEA
269 { 237 {
@@ -282,22 +250,6 @@ SSL_CIPHER ssl3_ciphers[] = {
282 }, 250 },
283#endif 251#endif
284 252
285 /* Cipher 08 */
286 {
287 .valid = 0, /* Weakened 40-bit export cipher. */
288 .name = SSL3_TXT_RSA_DES_40_CBC_SHA,
289 .id = SSL3_CK_RSA_DES_40_CBC_SHA,
290 .algorithm_mkey = SSL_kRSA,
291 .algorithm_auth = SSL_aRSA,
292 .algorithm_enc = SSL_DES,
293 .algorithm_mac = SSL_SHA1,
294 .algorithm_ssl = SSL_SSLV3,
295 .algo_strength = 0,
296 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
297 .strength_bits = 40,
298 .alg_bits = 56,
299 },
300
301 /* Cipher 09 */ 253 /* Cipher 09 */
302 { 254 {
303 .valid = 1, 255 .valid = 1,
@@ -330,119 +282,7 @@ SSL_CIPHER ssl3_ciphers[] = {
330 .alg_bits = 168, 282 .alg_bits = 168,
331 }, 283 },
332 284
333 /* The DH ciphers */
334 /* Cipher 0B */
335 {
336 .valid = 0, /* Weakened 40-bit export cipher. */
337 .name = SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
338 .id = SSL3_CK_DH_DSS_DES_40_CBC_SHA,
339 .algorithm_mkey = SSL_kDHd,
340 .algorithm_auth = SSL_aDH,
341 .algorithm_enc = SSL_DES,
342 .algorithm_mac = SSL_SHA1,
343 .algorithm_ssl = SSL_SSLV3,
344 .algo_strength = 0,
345 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
346 .strength_bits = 40,
347 .alg_bits = 56,
348 },
349
350 /* Cipher 0C */
351 {
352 .valid = 0, /* not implemented (non-ephemeral DH) */
353 .name = SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
354 .id = SSL3_CK_DH_DSS_DES_64_CBC_SHA,
355 .algorithm_mkey = SSL_kDHd,
356 .algorithm_auth = SSL_aDH,
357 .algorithm_enc = SSL_DES,
358 .algorithm_mac = SSL_SHA1,
359 .algorithm_ssl = SSL_SSLV3,
360 .algo_strength = SSL_LOW,
361 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
362 .strength_bits = 56,
363 .alg_bits = 56,
364 },
365
366 /* Cipher 0D */
367 {
368 .valid = 0, /* not implemented (non-ephemeral DH) */
369 .name = SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
370 .id = SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
371 .algorithm_mkey = SSL_kDHd,
372 .algorithm_auth = SSL_aDH,
373 .algorithm_enc = SSL_3DES,
374 .algorithm_mac = SSL_SHA1,
375 .algorithm_ssl = SSL_SSLV3,
376 .algo_strength = SSL_HIGH,
377 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
378 .strength_bits = 112,
379 .alg_bits = 168,
380 },
381
382 /* Cipher 0E */
383 {
384 .valid = 0, /* not implemented (non-ephemeral DH) */
385 .name = SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
386 .id = SSL3_CK_DH_RSA_DES_40_CBC_SHA,
387 .algorithm_mkey = SSL_kDHr,
388 .algorithm_auth = SSL_aDH,
389 .algorithm_enc = SSL_DES,
390 .algorithm_mac = SSL_SHA1,
391 .algorithm_ssl = SSL_SSLV3,
392 .algo_strength = 0,
393 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
394 .strength_bits = 40,
395 .alg_bits = 56,
396 },
397
398 /* Cipher 0F */
399 {
400 .valid = 0, /* not implemented (non-ephemeral DH) */
401 .name = SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
402 .id = SSL3_CK_DH_RSA_DES_64_CBC_SHA,
403 .algorithm_mkey = SSL_kDHr,
404 .algorithm_auth = SSL_aDH,
405 .algorithm_enc = SSL_DES,
406 .algorithm_mac = SSL_SHA1,
407 .algorithm_ssl = SSL_SSLV3,
408 .algo_strength = SSL_LOW,
409 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
410 .strength_bits = 56,
411 .alg_bits = 56,
412 },
413
414 /* Cipher 10 */
415 {
416 .valid = 0, /* not implemented (non-ephemeral DH) */
417 .name = SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
418 .id = SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
419 .algorithm_mkey = SSL_kDHr,
420 .algorithm_auth = SSL_aDH,
421 .algorithm_enc = SSL_3DES,
422 .algorithm_mac = SSL_SHA1,
423 .algorithm_ssl = SSL_SSLV3,
424 .algo_strength = SSL_HIGH,
425 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
426 .strength_bits = 112,
427 .alg_bits = 168,
428 },
429
430 /* The Ephemeral DH ciphers */ 285 /* The Ephemeral DH ciphers */
431 /* Cipher 11 */
432 {
433 .valid = 0, /* Weakened 40-bit export cipher. */
434 .name = SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
435 .id = SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
436 .algorithm_mkey = SSL_kDHE,
437 .algorithm_auth = SSL_aDSS,
438 .algorithm_enc = SSL_DES,
439 .algorithm_mac = SSL_SHA1,
440 .algorithm_ssl = SSL_SSLV3,
441 .algo_strength = 0,
442 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
443 .strength_bits = 40,
444 .alg_bits = 56,
445 },
446 286
447 /* Cipher 12 */ 287 /* Cipher 12 */
448 { 288 {
@@ -476,22 +316,6 @@ SSL_CIPHER ssl3_ciphers[] = {
476 .alg_bits = 168, 316 .alg_bits = 168,
477 }, 317 },
478 318
479 /* Cipher 14 */
480 {
481 .valid = 0, /* Weakened 40-bit export cipher. */
482 .name = SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
483 .id = SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
484 .algorithm_mkey = SSL_kDHE,
485 .algorithm_auth = SSL_aRSA,
486 .algorithm_enc = SSL_DES,
487 .algorithm_mac = SSL_SHA1,
488 .algorithm_ssl = SSL_SSLV3,
489 .algo_strength = 0,
490 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
491 .strength_bits = 40,
492 .alg_bits = 56,
493 },
494
495 /* Cipher 15 */ 319 /* Cipher 15 */
496 { 320 {
497 .valid = 1, 321 .valid = 1,
@@ -524,22 +348,6 @@ SSL_CIPHER ssl3_ciphers[] = {
524 .alg_bits = 168, 348 .alg_bits = 168,
525 }, 349 },
526 350
527 /* Cipher 17 */
528 {
529 .valid = 0, /* Weakened 40-bit export cipher. */
530 .name = SSL3_TXT_ADH_RC4_40_MD5,
531 .id = SSL3_CK_ADH_RC4_40_MD5,
532 .algorithm_mkey = SSL_kDHE,
533 .algorithm_auth = SSL_aNULL,
534 .algorithm_enc = SSL_RC4,
535 .algorithm_mac = SSL_MD5,
536 .algorithm_ssl = SSL_SSLV3,
537 .algo_strength = 0,
538 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
539 .strength_bits = 40,
540 .alg_bits = 128,
541 },
542
543 /* Cipher 18 */ 351 /* Cipher 18 */
544 { 352 {
545 .valid = 1, 353 .valid = 1,
@@ -556,22 +364,6 @@ SSL_CIPHER ssl3_ciphers[] = {
556 .alg_bits = 128, 364 .alg_bits = 128,
557 }, 365 },
558 366
559 /* Cipher 19 */
560 {
561 .valid = 0, /* Weakened 40-bit export cipher. */
562 .name = SSL3_TXT_ADH_DES_40_CBC_SHA,
563 .id = SSL3_CK_ADH_DES_40_CBC_SHA,
564 .algorithm_mkey = SSL_kDHE,
565 .algorithm_auth = SSL_aNULL,
566 .algorithm_enc = SSL_DES,
567 .algorithm_mac = SSL_SHA1,
568 .algorithm_ssl = SSL_SSLV3,
569 .algo_strength = 0,
570 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
571 .strength_bits = 40,
572 .alg_bits = 128,
573 },
574
575 /* Cipher 1A */ 367 /* Cipher 1A */
576 { 368 {
577 .valid = 1, 369 .valid = 1,
@@ -605,6 +397,7 @@ SSL_CIPHER ssl3_ciphers[] = {
605 }, 397 },
606 398
607 /* New AES ciphersuites */ 399 /* New AES ciphersuites */
400
608 /* Cipher 2F */ 401 /* Cipher 2F */
609 { 402 {
610 .valid = 1, 403 .valid = 1,
@@ -620,36 +413,7 @@ SSL_CIPHER ssl3_ciphers[] = {
620 .strength_bits = 128, 413 .strength_bits = 128,
621 .alg_bits = 128, 414 .alg_bits = 128,
622 }, 415 },
623 /* Cipher 30 */ 416
624 {
625 .valid = 0,
626 .name = TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
627 .id = TLS1_CK_DH_DSS_WITH_AES_128_SHA,
628 .algorithm_mkey = SSL_kDHd,
629 .algorithm_auth = SSL_aDH,
630 .algorithm_enc = SSL_AES128,
631 .algorithm_mac = SSL_SHA1,
632 .algorithm_ssl = SSL_TLSV1,
633 .algo_strength = SSL_HIGH,
634 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
635 .strength_bits = 128,
636 .alg_bits = 128,
637 },
638 /* Cipher 31 */
639 {
640 .valid = 0,
641 .name = TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
642 .id = TLS1_CK_DH_RSA_WITH_AES_128_SHA,
643 .algorithm_mkey = SSL_kDHr,
644 .algorithm_auth = SSL_aDH,
645 .algorithm_enc = SSL_AES128,
646 .algorithm_mac = SSL_SHA1,
647 .algorithm_ssl = SSL_TLSV1,
648 .algo_strength = SSL_HIGH,
649 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
650 .strength_bits = 128,
651 .alg_bits = 128,
652 },
653 /* Cipher 32 */ 417 /* Cipher 32 */
654 { 418 {
655 .valid = 1, 419 .valid = 1,
@@ -665,6 +429,7 @@ SSL_CIPHER ssl3_ciphers[] = {
665 .strength_bits = 128, 429 .strength_bits = 128,
666 .alg_bits = 128, 430 .alg_bits = 128,
667 }, 431 },
432
668 /* Cipher 33 */ 433 /* Cipher 33 */
669 { 434 {
670 .valid = 1, 435 .valid = 1,
@@ -680,6 +445,7 @@ SSL_CIPHER ssl3_ciphers[] = {
680 .strength_bits = 128, 445 .strength_bits = 128,
681 .alg_bits = 128, 446 .alg_bits = 128,
682 }, 447 },
448
683 /* Cipher 34 */ 449 /* Cipher 34 */
684 { 450 {
685 .valid = 1, 451 .valid = 1,
@@ -711,37 +477,6 @@ SSL_CIPHER ssl3_ciphers[] = {
711 .strength_bits = 256, 477 .strength_bits = 256,
712 .alg_bits = 256, 478 .alg_bits = 256,
713 }, 479 },
714 /* Cipher 36 */
715 {
716 .valid = 0,
717 .name = TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
718 .id = TLS1_CK_DH_DSS_WITH_AES_256_SHA,
719 .algorithm_mkey = SSL_kDHd,
720 .algorithm_auth = SSL_aDH,
721 .algorithm_enc = SSL_AES256,
722 .algorithm_mac = SSL_SHA1,
723 .algorithm_ssl = SSL_TLSV1,
724 .algo_strength = SSL_HIGH,
725 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
726 .strength_bits = 256,
727 .alg_bits = 256,
728 },
729
730 /* Cipher 37 */
731 {
732 .valid = 0, /* not implemented (non-ephemeral DH) */
733 .name = TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
734 .id = TLS1_CK_DH_RSA_WITH_AES_256_SHA,
735 .algorithm_mkey = SSL_kDHr,
736 .algorithm_auth = SSL_aDH,
737 .algorithm_enc = SSL_AES256,
738 .algorithm_mac = SSL_SHA1,
739 .algorithm_ssl = SSL_TLSV1,
740 .algo_strength = SSL_HIGH,
741 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
742 .strength_bits = 256,
743 .alg_bits = 256,
744 },
745 480
746 /* Cipher 38 */ 481 /* Cipher 38 */
747 { 482 {
@@ -840,38 +575,6 @@ SSL_CIPHER ssl3_ciphers[] = {
840 .alg_bits = 256, 575 .alg_bits = 256,
841 }, 576 },
842 577
843 /* Cipher 3E */
844 {
845 .valid = 0, /* not implemented (non-ephemeral DH) */
846 .name = TLS1_TXT_DH_DSS_WITH_AES_128_SHA256,
847 .id = TLS1_CK_DH_DSS_WITH_AES_128_SHA256,
848 .algorithm_mkey = SSL_kDHd,
849 .algorithm_auth = SSL_aDH,
850 .algorithm_enc = SSL_AES128,
851 .algorithm_mac = SSL_SHA256,
852 .algorithm_ssl = SSL_TLSV1_2,
853 .algo_strength = SSL_HIGH,
854 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
855 .strength_bits = 128,
856 .alg_bits = 128,
857 },
858
859 /* Cipher 3F */
860 {
861 .valid = 0, /* not implemented (non-ephemeral DH) */
862 .name = TLS1_TXT_DH_RSA_WITH_AES_128_SHA256,
863 .id = TLS1_CK_DH_RSA_WITH_AES_128_SHA256,
864 .algorithm_mkey = SSL_kDHr,
865 .algorithm_auth = SSL_aDH,
866 .algorithm_enc = SSL_AES128,
867 .algorithm_mac = SSL_SHA256,
868 .algorithm_ssl = SSL_TLSV1_2,
869 .algo_strength = SSL_HIGH,
870 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
871 .strength_bits = 128,
872 .alg_bits = 128,
873 },
874
875 /* Cipher 40 */ 578 /* Cipher 40 */
876 { 579 {
877 .valid = 1, 580 .valid = 1,
@@ -907,38 +610,6 @@ SSL_CIPHER ssl3_ciphers[] = {
907 .alg_bits = 128, 610 .alg_bits = 128,
908 }, 611 },
909 612
910 /* Cipher 42 */
911 {
912 .valid = 0, /* not implemented (non-ephemeral DH) */
913 .name = TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
914 .id = TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
915 .algorithm_mkey = SSL_kDHd,
916 .algorithm_auth = SSL_aDH,
917 .algorithm_enc = SSL_CAMELLIA128,
918 .algorithm_mac = SSL_SHA1,
919 .algorithm_ssl = SSL_TLSV1,
920 .algo_strength = SSL_HIGH,
921 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
922 .strength_bits = 128,
923 .alg_bits = 128,
924 },
925
926 /* Cipher 43 */
927 {
928 .valid = 0, /* not implemented (non-ephemeral DH) */
929 .name = TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
930 .id = TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
931 .algorithm_mkey = SSL_kDHr,
932 .algorithm_auth = SSL_aDH,
933 .algorithm_enc = SSL_CAMELLIA128,
934 .algorithm_mac = SSL_SHA1,
935 .algorithm_ssl = SSL_TLSV1,
936 .algo_strength = SSL_HIGH,
937 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
938 .strength_bits = 128,
939 .alg_bits = 128,
940 },
941
942 /* Cipher 44 */ 613 /* Cipher 44 */
943 { 614 {
944 .valid = 1, 615 .valid = 1,
@@ -1005,38 +676,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1005 .alg_bits = 128, 676 .alg_bits = 128,
1006 }, 677 },
1007 678
1008 /* Cipher 68 */
1009 {
1010 .valid = 0, /* not implemented (non-ephemeral DH) */
1011 .name = TLS1_TXT_DH_DSS_WITH_AES_256_SHA256,
1012 .id = TLS1_CK_DH_DSS_WITH_AES_256_SHA256,
1013 .algorithm_mkey = SSL_kDHd,
1014 .algorithm_auth = SSL_aDH,
1015 .algorithm_enc = SSL_AES256,
1016 .algorithm_mac = SSL_SHA256,
1017 .algorithm_ssl = SSL_TLSV1_2,
1018 .algo_strength = SSL_HIGH,
1019 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1020 .strength_bits = 256,
1021 .alg_bits = 256,
1022 },
1023
1024 /* Cipher 69 */
1025 {
1026 .valid = 0, /* not implemented (non-ephemeral DH) */
1027 .name = TLS1_TXT_DH_RSA_WITH_AES_256_SHA256,
1028 .id = TLS1_CK_DH_RSA_WITH_AES_256_SHA256,
1029 .algorithm_mkey = SSL_kDHr,
1030 .algorithm_auth = SSL_aDH,
1031 .algorithm_enc = SSL_AES256,
1032 .algorithm_mac = SSL_SHA256,
1033 .algorithm_ssl = SSL_TLSV1_2,
1034 .algo_strength = SSL_HIGH,
1035 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1036 .strength_bits = 256,
1037 .alg_bits = 256,
1038 },
1039
1040 /* Cipher 6A */ 679 /* Cipher 6A */
1041 { 680 {
1042 .valid = 1, 681 .valid = 1,
@@ -1181,38 +820,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1181 .alg_bits = 256, 820 .alg_bits = 256,
1182 }, 821 },
1183 822
1184 /* Cipher 85 */
1185 {
1186 .valid = 0, /* not implemented (non-ephemeral DH) */
1187 .name = TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
1188 .id = TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
1189 .algorithm_mkey = SSL_kDHd,
1190 .algorithm_auth = SSL_aDH,
1191 .algorithm_enc = SSL_CAMELLIA256,
1192 .algorithm_mac = SSL_SHA1,
1193 .algorithm_ssl = SSL_TLSV1,
1194 .algo_strength = SSL_HIGH,
1195 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1196 .strength_bits = 256,
1197 .alg_bits = 256,
1198 },
1199
1200 /* Cipher 86 */
1201 {
1202 .valid = 0, /* not implemented (non-ephemeral DH) */
1203 .name = TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
1204 .id = TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
1205 .algorithm_mkey = SSL_kDHr,
1206 .algorithm_auth = SSL_aDH,
1207 .algorithm_enc = SSL_CAMELLIA256,
1208 .algorithm_mac = SSL_SHA1,
1209 .algorithm_ssl = SSL_TLSV1,
1210 .algo_strength = SSL_HIGH,
1211 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1212 .strength_bits = 256,
1213 .alg_bits = 256,
1214 },
1215
1216 /* Cipher 87 */ 823 /* Cipher 87 */
1217 { 824 {
1218 .valid = 1, 825 .valid = 1,
@@ -1337,42 +944,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1337 .alg_bits = 256, 944 .alg_bits = 256,
1338 }, 945 },
1339 946
1340 /* Cipher A0 */
1341 {
1342 .valid = 0,
1343 .name = TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256,
1344 .id = TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256,
1345 .algorithm_mkey = SSL_kDHr,
1346 .algorithm_auth = SSL_aDH,
1347 .algorithm_enc = SSL_AES128GCM,
1348 .algorithm_mac = SSL_AEAD,
1349 .algorithm_ssl = SSL_TLSV1_2,
1350 .algo_strength = SSL_HIGH,
1351 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
1352 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1353 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1354 .strength_bits = 128,
1355 .alg_bits = 128,
1356 },
1357
1358 /* Cipher A1 */
1359 {
1360 .valid = 0,
1361 .name = TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384,
1362 .id = TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384,
1363 .algorithm_mkey = SSL_kDHr,
1364 .algorithm_auth = SSL_aDH,
1365 .algorithm_enc = SSL_AES256GCM,
1366 .algorithm_mac = SSL_AEAD,
1367 .algorithm_ssl = SSL_TLSV1_2,
1368 .algo_strength = SSL_HIGH,
1369 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
1370 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1371 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1372 .strength_bits = 256,
1373 .alg_bits = 256,
1374 },
1375
1376 /* Cipher A2 */ 947 /* Cipher A2 */
1377 { 948 {
1378 .valid = 1, 949 .valid = 1,
@@ -1409,42 +980,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1409 .alg_bits = 256, 980 .alg_bits = 256,
1410 }, 981 },
1411 982
1412 /* Cipher A4 */
1413 {
1414 .valid = 0,
1415 .name = TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256,
1416 .id = TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256,
1417 .algorithm_mkey = SSL_kDHd,
1418 .algorithm_auth = SSL_aDH,
1419 .algorithm_enc = SSL_AES128GCM,
1420 .algorithm_mac = SSL_AEAD,
1421 .algorithm_ssl = SSL_TLSV1_2,
1422 .algo_strength = SSL_HIGH,
1423 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
1424 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1425 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1426 .strength_bits = 128,
1427 .alg_bits = 128,
1428 },
1429
1430 /* Cipher A5 */
1431 {
1432 .valid = 0,
1433 .name = TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384,
1434 .id = TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384,
1435 .algorithm_mkey = SSL_kDHd,
1436 .algorithm_auth = SSL_aDH,
1437 .algorithm_enc = SSL_AES256GCM,
1438 .algorithm_mac = SSL_AEAD,
1439 .algorithm_ssl = SSL_TLSV1_2,
1440 .algo_strength = SSL_HIGH,
1441 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
1442 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1443 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1444 .strength_bits = 256,
1445 .alg_bits = 256,
1446 },
1447
1448 /* Cipher A6 */ 983 /* Cipher A6 */
1449 { 984 {
1450 .valid = 1, 985 .valid = 1,
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index 4631c517cc..e66f841df3 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.73 2014/08/07 20:02:23 miod Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.74 2014/08/10 14:57:04 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 *
@@ -200,22 +200,6 @@ SSL_CIPHER ssl3_ciphers[] = {
200 .alg_bits = 0, 200 .alg_bits = 0,
201 }, 201 },
202 202
203 /* Cipher 03 */
204 {
205 .valid = 0, /* Weakened 40-bit export cipher. */
206 .name = SSL3_TXT_RSA_RC4_40_MD5,
207 .id = SSL3_CK_RSA_RC4_40_MD5,
208 .algorithm_mkey = SSL_kRSA,
209 .algorithm_auth = SSL_aRSA,
210 .algorithm_enc = SSL_RC4,
211 .algorithm_mac = SSL_MD5,
212 .algorithm_ssl = SSL_SSLV3,
213 .algo_strength = 0,
214 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
215 .strength_bits = 40,
216 .alg_bits = 128,
217 },
218
219 /* Cipher 04 */ 203 /* Cipher 04 */
220 { 204 {
221 .valid = 1, 205 .valid = 1,
@@ -248,22 +232,6 @@ SSL_CIPHER ssl3_ciphers[] = {
248 .alg_bits = 128, 232 .alg_bits = 128,
249 }, 233 },
250 234
251 /* Cipher 06 */
252 {
253 .valid = 0, /* Weakened 40-bit export cipher. */
254 .name = SSL3_TXT_RSA_RC2_40_MD5,
255 .id = SSL3_CK_RSA_RC2_40_MD5,
256 .algorithm_mkey = SSL_kRSA,
257 .algorithm_auth = SSL_aRSA,
258 .algorithm_enc = SSL_RC2,
259 .algorithm_mac = SSL_MD5,
260 .algorithm_ssl = SSL_SSLV3,
261 .algo_strength = 0,
262 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
263 .strength_bits = 40,
264 .alg_bits = 128,
265 },
266
267 /* Cipher 07 */ 235 /* Cipher 07 */
268#ifndef OPENSSL_NO_IDEA 236#ifndef OPENSSL_NO_IDEA
269 { 237 {
@@ -282,22 +250,6 @@ SSL_CIPHER ssl3_ciphers[] = {
282 }, 250 },
283#endif 251#endif
284 252
285 /* Cipher 08 */
286 {
287 .valid = 0, /* Weakened 40-bit export cipher. */
288 .name = SSL3_TXT_RSA_DES_40_CBC_SHA,
289 .id = SSL3_CK_RSA_DES_40_CBC_SHA,
290 .algorithm_mkey = SSL_kRSA,
291 .algorithm_auth = SSL_aRSA,
292 .algorithm_enc = SSL_DES,
293 .algorithm_mac = SSL_SHA1,
294 .algorithm_ssl = SSL_SSLV3,
295 .algo_strength = 0,
296 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
297 .strength_bits = 40,
298 .alg_bits = 56,
299 },
300
301 /* Cipher 09 */ 253 /* Cipher 09 */
302 { 254 {
303 .valid = 1, 255 .valid = 1,
@@ -330,119 +282,7 @@ SSL_CIPHER ssl3_ciphers[] = {
330 .alg_bits = 168, 282 .alg_bits = 168,
331 }, 283 },
332 284
333 /* The DH ciphers */
334 /* Cipher 0B */
335 {
336 .valid = 0, /* Weakened 40-bit export cipher. */
337 .name = SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
338 .id = SSL3_CK_DH_DSS_DES_40_CBC_SHA,
339 .algorithm_mkey = SSL_kDHd,
340 .algorithm_auth = SSL_aDH,
341 .algorithm_enc = SSL_DES,
342 .algorithm_mac = SSL_SHA1,
343 .algorithm_ssl = SSL_SSLV3,
344 .algo_strength = 0,
345 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
346 .strength_bits = 40,
347 .alg_bits = 56,
348 },
349
350 /* Cipher 0C */
351 {
352 .valid = 0, /* not implemented (non-ephemeral DH) */
353 .name = SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
354 .id = SSL3_CK_DH_DSS_DES_64_CBC_SHA,
355 .algorithm_mkey = SSL_kDHd,
356 .algorithm_auth = SSL_aDH,
357 .algorithm_enc = SSL_DES,
358 .algorithm_mac = SSL_SHA1,
359 .algorithm_ssl = SSL_SSLV3,
360 .algo_strength = SSL_LOW,
361 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
362 .strength_bits = 56,
363 .alg_bits = 56,
364 },
365
366 /* Cipher 0D */
367 {
368 .valid = 0, /* not implemented (non-ephemeral DH) */
369 .name = SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
370 .id = SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
371 .algorithm_mkey = SSL_kDHd,
372 .algorithm_auth = SSL_aDH,
373 .algorithm_enc = SSL_3DES,
374 .algorithm_mac = SSL_SHA1,
375 .algorithm_ssl = SSL_SSLV3,
376 .algo_strength = SSL_HIGH,
377 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
378 .strength_bits = 112,
379 .alg_bits = 168,
380 },
381
382 /* Cipher 0E */
383 {
384 .valid = 0, /* not implemented (non-ephemeral DH) */
385 .name = SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
386 .id = SSL3_CK_DH_RSA_DES_40_CBC_SHA,
387 .algorithm_mkey = SSL_kDHr,
388 .algorithm_auth = SSL_aDH,
389 .algorithm_enc = SSL_DES,
390 .algorithm_mac = SSL_SHA1,
391 .algorithm_ssl = SSL_SSLV3,
392 .algo_strength = 0,
393 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
394 .strength_bits = 40,
395 .alg_bits = 56,
396 },
397
398 /* Cipher 0F */
399 {
400 .valid = 0, /* not implemented (non-ephemeral DH) */
401 .name = SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
402 .id = SSL3_CK_DH_RSA_DES_64_CBC_SHA,
403 .algorithm_mkey = SSL_kDHr,
404 .algorithm_auth = SSL_aDH,
405 .algorithm_enc = SSL_DES,
406 .algorithm_mac = SSL_SHA1,
407 .algorithm_ssl = SSL_SSLV3,
408 .algo_strength = SSL_LOW,
409 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
410 .strength_bits = 56,
411 .alg_bits = 56,
412 },
413
414 /* Cipher 10 */
415 {
416 .valid = 0, /* not implemented (non-ephemeral DH) */
417 .name = SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
418 .id = SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
419 .algorithm_mkey = SSL_kDHr,
420 .algorithm_auth = SSL_aDH,
421 .algorithm_enc = SSL_3DES,
422 .algorithm_mac = SSL_SHA1,
423 .algorithm_ssl = SSL_SSLV3,
424 .algo_strength = SSL_HIGH,
425 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
426 .strength_bits = 112,
427 .alg_bits = 168,
428 },
429
430 /* The Ephemeral DH ciphers */ 285 /* The Ephemeral DH ciphers */
431 /* Cipher 11 */
432 {
433 .valid = 0, /* Weakened 40-bit export cipher. */
434 .name = SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
435 .id = SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
436 .algorithm_mkey = SSL_kDHE,
437 .algorithm_auth = SSL_aDSS,
438 .algorithm_enc = SSL_DES,
439 .algorithm_mac = SSL_SHA1,
440 .algorithm_ssl = SSL_SSLV3,
441 .algo_strength = 0,
442 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
443 .strength_bits = 40,
444 .alg_bits = 56,
445 },
446 286
447 /* Cipher 12 */ 287 /* Cipher 12 */
448 { 288 {
@@ -476,22 +316,6 @@ SSL_CIPHER ssl3_ciphers[] = {
476 .alg_bits = 168, 316 .alg_bits = 168,
477 }, 317 },
478 318
479 /* Cipher 14 */
480 {
481 .valid = 0, /* Weakened 40-bit export cipher. */
482 .name = SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
483 .id = SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
484 .algorithm_mkey = SSL_kDHE,
485 .algorithm_auth = SSL_aRSA,
486 .algorithm_enc = SSL_DES,
487 .algorithm_mac = SSL_SHA1,
488 .algorithm_ssl = SSL_SSLV3,
489 .algo_strength = 0,
490 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
491 .strength_bits = 40,
492 .alg_bits = 56,
493 },
494
495 /* Cipher 15 */ 319 /* Cipher 15 */
496 { 320 {
497 .valid = 1, 321 .valid = 1,
@@ -524,22 +348,6 @@ SSL_CIPHER ssl3_ciphers[] = {
524 .alg_bits = 168, 348 .alg_bits = 168,
525 }, 349 },
526 350
527 /* Cipher 17 */
528 {
529 .valid = 0, /* Weakened 40-bit export cipher. */
530 .name = SSL3_TXT_ADH_RC4_40_MD5,
531 .id = SSL3_CK_ADH_RC4_40_MD5,
532 .algorithm_mkey = SSL_kDHE,
533 .algorithm_auth = SSL_aNULL,
534 .algorithm_enc = SSL_RC4,
535 .algorithm_mac = SSL_MD5,
536 .algorithm_ssl = SSL_SSLV3,
537 .algo_strength = 0,
538 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
539 .strength_bits = 40,
540 .alg_bits = 128,
541 },
542
543 /* Cipher 18 */ 351 /* Cipher 18 */
544 { 352 {
545 .valid = 1, 353 .valid = 1,
@@ -556,22 +364,6 @@ SSL_CIPHER ssl3_ciphers[] = {
556 .alg_bits = 128, 364 .alg_bits = 128,
557 }, 365 },
558 366
559 /* Cipher 19 */
560 {
561 .valid = 0, /* Weakened 40-bit export cipher. */
562 .name = SSL3_TXT_ADH_DES_40_CBC_SHA,
563 .id = SSL3_CK_ADH_DES_40_CBC_SHA,
564 .algorithm_mkey = SSL_kDHE,
565 .algorithm_auth = SSL_aNULL,
566 .algorithm_enc = SSL_DES,
567 .algorithm_mac = SSL_SHA1,
568 .algorithm_ssl = SSL_SSLV3,
569 .algo_strength = 0,
570 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
571 .strength_bits = 40,
572 .alg_bits = 128,
573 },
574
575 /* Cipher 1A */ 367 /* Cipher 1A */
576 { 368 {
577 .valid = 1, 369 .valid = 1,
@@ -605,6 +397,7 @@ SSL_CIPHER ssl3_ciphers[] = {
605 }, 397 },
606 398
607 /* New AES ciphersuites */ 399 /* New AES ciphersuites */
400
608 /* Cipher 2F */ 401 /* Cipher 2F */
609 { 402 {
610 .valid = 1, 403 .valid = 1,
@@ -620,36 +413,7 @@ SSL_CIPHER ssl3_ciphers[] = {
620 .strength_bits = 128, 413 .strength_bits = 128,
621 .alg_bits = 128, 414 .alg_bits = 128,
622 }, 415 },
623 /* Cipher 30 */ 416
624 {
625 .valid = 0,
626 .name = TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
627 .id = TLS1_CK_DH_DSS_WITH_AES_128_SHA,
628 .algorithm_mkey = SSL_kDHd,
629 .algorithm_auth = SSL_aDH,
630 .algorithm_enc = SSL_AES128,
631 .algorithm_mac = SSL_SHA1,
632 .algorithm_ssl = SSL_TLSV1,
633 .algo_strength = SSL_HIGH,
634 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
635 .strength_bits = 128,
636 .alg_bits = 128,
637 },
638 /* Cipher 31 */
639 {
640 .valid = 0,
641 .name = TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
642 .id = TLS1_CK_DH_RSA_WITH_AES_128_SHA,
643 .algorithm_mkey = SSL_kDHr,
644 .algorithm_auth = SSL_aDH,
645 .algorithm_enc = SSL_AES128,
646 .algorithm_mac = SSL_SHA1,
647 .algorithm_ssl = SSL_TLSV1,
648 .algo_strength = SSL_HIGH,
649 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
650 .strength_bits = 128,
651 .alg_bits = 128,
652 },
653 /* Cipher 32 */ 417 /* Cipher 32 */
654 { 418 {
655 .valid = 1, 419 .valid = 1,
@@ -665,6 +429,7 @@ SSL_CIPHER ssl3_ciphers[] = {
665 .strength_bits = 128, 429 .strength_bits = 128,
666 .alg_bits = 128, 430 .alg_bits = 128,
667 }, 431 },
432
668 /* Cipher 33 */ 433 /* Cipher 33 */
669 { 434 {
670 .valid = 1, 435 .valid = 1,
@@ -680,6 +445,7 @@ SSL_CIPHER ssl3_ciphers[] = {
680 .strength_bits = 128, 445 .strength_bits = 128,
681 .alg_bits = 128, 446 .alg_bits = 128,
682 }, 447 },
448
683 /* Cipher 34 */ 449 /* Cipher 34 */
684 { 450 {
685 .valid = 1, 451 .valid = 1,
@@ -711,37 +477,6 @@ SSL_CIPHER ssl3_ciphers[] = {
711 .strength_bits = 256, 477 .strength_bits = 256,
712 .alg_bits = 256, 478 .alg_bits = 256,
713 }, 479 },
714 /* Cipher 36 */
715 {
716 .valid = 0,
717 .name = TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
718 .id = TLS1_CK_DH_DSS_WITH_AES_256_SHA,
719 .algorithm_mkey = SSL_kDHd,
720 .algorithm_auth = SSL_aDH,
721 .algorithm_enc = SSL_AES256,
722 .algorithm_mac = SSL_SHA1,
723 .algorithm_ssl = SSL_TLSV1,
724 .algo_strength = SSL_HIGH,
725 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
726 .strength_bits = 256,
727 .alg_bits = 256,
728 },
729
730 /* Cipher 37 */
731 {
732 .valid = 0, /* not implemented (non-ephemeral DH) */
733 .name = TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
734 .id = TLS1_CK_DH_RSA_WITH_AES_256_SHA,
735 .algorithm_mkey = SSL_kDHr,
736 .algorithm_auth = SSL_aDH,
737 .algorithm_enc = SSL_AES256,
738 .algorithm_mac = SSL_SHA1,
739 .algorithm_ssl = SSL_TLSV1,
740 .algo_strength = SSL_HIGH,
741 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
742 .strength_bits = 256,
743 .alg_bits = 256,
744 },
745 480
746 /* Cipher 38 */ 481 /* Cipher 38 */
747 { 482 {
@@ -840,38 +575,6 @@ SSL_CIPHER ssl3_ciphers[] = {
840 .alg_bits = 256, 575 .alg_bits = 256,
841 }, 576 },
842 577
843 /* Cipher 3E */
844 {
845 .valid = 0, /* not implemented (non-ephemeral DH) */
846 .name = TLS1_TXT_DH_DSS_WITH_AES_128_SHA256,
847 .id = TLS1_CK_DH_DSS_WITH_AES_128_SHA256,
848 .algorithm_mkey = SSL_kDHd,
849 .algorithm_auth = SSL_aDH,
850 .algorithm_enc = SSL_AES128,
851 .algorithm_mac = SSL_SHA256,
852 .algorithm_ssl = SSL_TLSV1_2,
853 .algo_strength = SSL_HIGH,
854 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
855 .strength_bits = 128,
856 .alg_bits = 128,
857 },
858
859 /* Cipher 3F */
860 {
861 .valid = 0, /* not implemented (non-ephemeral DH) */
862 .name = TLS1_TXT_DH_RSA_WITH_AES_128_SHA256,
863 .id = TLS1_CK_DH_RSA_WITH_AES_128_SHA256,
864 .algorithm_mkey = SSL_kDHr,
865 .algorithm_auth = SSL_aDH,
866 .algorithm_enc = SSL_AES128,
867 .algorithm_mac = SSL_SHA256,
868 .algorithm_ssl = SSL_TLSV1_2,
869 .algo_strength = SSL_HIGH,
870 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
871 .strength_bits = 128,
872 .alg_bits = 128,
873 },
874
875 /* Cipher 40 */ 578 /* Cipher 40 */
876 { 579 {
877 .valid = 1, 580 .valid = 1,
@@ -907,38 +610,6 @@ SSL_CIPHER ssl3_ciphers[] = {
907 .alg_bits = 128, 610 .alg_bits = 128,
908 }, 611 },
909 612
910 /* Cipher 42 */
911 {
912 .valid = 0, /* not implemented (non-ephemeral DH) */
913 .name = TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
914 .id = TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
915 .algorithm_mkey = SSL_kDHd,
916 .algorithm_auth = SSL_aDH,
917 .algorithm_enc = SSL_CAMELLIA128,
918 .algorithm_mac = SSL_SHA1,
919 .algorithm_ssl = SSL_TLSV1,
920 .algo_strength = SSL_HIGH,
921 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
922 .strength_bits = 128,
923 .alg_bits = 128,
924 },
925
926 /* Cipher 43 */
927 {
928 .valid = 0, /* not implemented (non-ephemeral DH) */
929 .name = TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
930 .id = TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
931 .algorithm_mkey = SSL_kDHr,
932 .algorithm_auth = SSL_aDH,
933 .algorithm_enc = SSL_CAMELLIA128,
934 .algorithm_mac = SSL_SHA1,
935 .algorithm_ssl = SSL_TLSV1,
936 .algo_strength = SSL_HIGH,
937 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
938 .strength_bits = 128,
939 .alg_bits = 128,
940 },
941
942 /* Cipher 44 */ 613 /* Cipher 44 */
943 { 614 {
944 .valid = 1, 615 .valid = 1,
@@ -1005,38 +676,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1005 .alg_bits = 128, 676 .alg_bits = 128,
1006 }, 677 },
1007 678
1008 /* Cipher 68 */
1009 {
1010 .valid = 0, /* not implemented (non-ephemeral DH) */
1011 .name = TLS1_TXT_DH_DSS_WITH_AES_256_SHA256,
1012 .id = TLS1_CK_DH_DSS_WITH_AES_256_SHA256,
1013 .algorithm_mkey = SSL_kDHd,
1014 .algorithm_auth = SSL_aDH,
1015 .algorithm_enc = SSL_AES256,
1016 .algorithm_mac = SSL_SHA256,
1017 .algorithm_ssl = SSL_TLSV1_2,
1018 .algo_strength = SSL_HIGH,
1019 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1020 .strength_bits = 256,
1021 .alg_bits = 256,
1022 },
1023
1024 /* Cipher 69 */
1025 {
1026 .valid = 0, /* not implemented (non-ephemeral DH) */
1027 .name = TLS1_TXT_DH_RSA_WITH_AES_256_SHA256,
1028 .id = TLS1_CK_DH_RSA_WITH_AES_256_SHA256,
1029 .algorithm_mkey = SSL_kDHr,
1030 .algorithm_auth = SSL_aDH,
1031 .algorithm_enc = SSL_AES256,
1032 .algorithm_mac = SSL_SHA256,
1033 .algorithm_ssl = SSL_TLSV1_2,
1034 .algo_strength = SSL_HIGH,
1035 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1036 .strength_bits = 256,
1037 .alg_bits = 256,
1038 },
1039
1040 /* Cipher 6A */ 679 /* Cipher 6A */
1041 { 680 {
1042 .valid = 1, 681 .valid = 1,
@@ -1181,38 +820,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1181 .alg_bits = 256, 820 .alg_bits = 256,
1182 }, 821 },
1183 822
1184 /* Cipher 85 */
1185 {
1186 .valid = 0, /* not implemented (non-ephemeral DH) */
1187 .name = TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
1188 .id = TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
1189 .algorithm_mkey = SSL_kDHd,
1190 .algorithm_auth = SSL_aDH,
1191 .algorithm_enc = SSL_CAMELLIA256,
1192 .algorithm_mac = SSL_SHA1,
1193 .algorithm_ssl = SSL_TLSV1,
1194 .algo_strength = SSL_HIGH,
1195 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1196 .strength_bits = 256,
1197 .alg_bits = 256,
1198 },
1199
1200 /* Cipher 86 */
1201 {
1202 .valid = 0, /* not implemented (non-ephemeral DH) */
1203 .name = TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
1204 .id = TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
1205 .algorithm_mkey = SSL_kDHr,
1206 .algorithm_auth = SSL_aDH,
1207 .algorithm_enc = SSL_CAMELLIA256,
1208 .algorithm_mac = SSL_SHA1,
1209 .algorithm_ssl = SSL_TLSV1,
1210 .algo_strength = SSL_HIGH,
1211 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1212 .strength_bits = 256,
1213 .alg_bits = 256,
1214 },
1215
1216 /* Cipher 87 */ 823 /* Cipher 87 */
1217 { 824 {
1218 .valid = 1, 825 .valid = 1,
@@ -1337,42 +944,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1337 .alg_bits = 256, 944 .alg_bits = 256,
1338 }, 945 },
1339 946
1340 /* Cipher A0 */
1341 {
1342 .valid = 0,
1343 .name = TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256,
1344 .id = TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256,
1345 .algorithm_mkey = SSL_kDHr,
1346 .algorithm_auth = SSL_aDH,
1347 .algorithm_enc = SSL_AES128GCM,
1348 .algorithm_mac = SSL_AEAD,
1349 .algorithm_ssl = SSL_TLSV1_2,
1350 .algo_strength = SSL_HIGH,
1351 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
1352 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1353 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1354 .strength_bits = 128,
1355 .alg_bits = 128,
1356 },
1357
1358 /* Cipher A1 */
1359 {
1360 .valid = 0,
1361 .name = TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384,
1362 .id = TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384,
1363 .algorithm_mkey = SSL_kDHr,
1364 .algorithm_auth = SSL_aDH,
1365 .algorithm_enc = SSL_AES256GCM,
1366 .algorithm_mac = SSL_AEAD,
1367 .algorithm_ssl = SSL_TLSV1_2,
1368 .algo_strength = SSL_HIGH,
1369 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
1370 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1371 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1372 .strength_bits = 256,
1373 .alg_bits = 256,
1374 },
1375
1376 /* Cipher A2 */ 947 /* Cipher A2 */
1377 { 948 {
1378 .valid = 1, 949 .valid = 1,
@@ -1409,42 +980,6 @@ SSL_CIPHER ssl3_ciphers[] = {
1409 .alg_bits = 256, 980 .alg_bits = 256,
1410 }, 981 },
1411 982
1412 /* Cipher A4 */
1413 {
1414 .valid = 0,
1415 .name = TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256,
1416 .id = TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256,
1417 .algorithm_mkey = SSL_kDHd,
1418 .algorithm_auth = SSL_aDH,
1419 .algorithm_enc = SSL_AES128GCM,
1420 .algorithm_mac = SSL_AEAD,
1421 .algorithm_ssl = SSL_TLSV1_2,
1422 .algo_strength = SSL_HIGH,
1423 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
1424 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1425 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1426 .strength_bits = 128,
1427 .alg_bits = 128,
1428 },
1429
1430 /* Cipher A5 */
1431 {
1432 .valid = 0,
1433 .name = TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384,
1434 .id = TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384,
1435 .algorithm_mkey = SSL_kDHd,
1436 .algorithm_auth = SSL_aDH,
1437 .algorithm_enc = SSL_AES256GCM,
1438 .algorithm_mac = SSL_AEAD,
1439 .algorithm_ssl = SSL_TLSV1_2,
1440 .algo_strength = SSL_HIGH,
1441 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
1442 SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
1443 SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1444 .strength_bits = 256,
1445 .alg_bits = 256,
1446 },
1447
1448 /* Cipher A6 */ 983 /* Cipher A6 */
1449 { 984 {
1450 .valid = 1, 985 .valid = 1,
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 12:19:15 +0000