summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2024-07-15 14:45:15 +0000
committerjsing <>2024-07-15 14:45:15 +0000
commitcc7031b63a6f84ab84ffe44284b3c9c68500be07 (patch)
tree5d2e625a962e99823de07ae569d7a4439bfc9c3a /src
parentce786f8f377f8c77e8b0986312286af97c5145bf (diff)
downloadopenbsd-cc7031b63a6f84ab84ffe44284b3c9c68500be07.tar.gz
openbsd-cc7031b63a6f84ab84ffe44284b3c9c68500be07.tar.bz2
openbsd-cc7031b63a6f84ab84ffe44284b3c9c68500be07.zip
Mop up TLS1_PRF* defines.
These have not been used for a long time, however SSL_CIPHER was not opaque at the time, hence they had to stick around. Now that SSL_CIPHER is opaque we can simply mop them up. ok tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/s3_lib.c132
-rw-r--r--src/lib/libssl/ssl_local.h11
2 files changed, 67 insertions, 76 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 0eec6e9712..1c1906d9e7 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.252 2024/05/10 05:08:05 tb Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.253 2024/07/15 14:45:15 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 *
@@ -183,7 +183,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
183 .algorithm_mac = SSL_MD5, 183 .algorithm_mac = SSL_MD5,
184 .algorithm_ssl = SSL_SSLV3, 184 .algorithm_ssl = SSL_SSLV3,
185 .algo_strength = SSL_STRONG_NONE, 185 .algo_strength = SSL_STRONG_NONE,
186 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 186 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
187 .strength_bits = 0, 187 .strength_bits = 0,
188 .alg_bits = 0, 188 .alg_bits = 0,
189 }, 189 },
@@ -199,7 +199,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
199 .algorithm_mac = SSL_SHA1, 199 .algorithm_mac = SSL_SHA1,
200 .algorithm_ssl = SSL_SSLV3, 200 .algorithm_ssl = SSL_SSLV3,
201 .algo_strength = SSL_STRONG_NONE, 201 .algo_strength = SSL_STRONG_NONE,
202 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 202 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
203 .strength_bits = 0, 203 .strength_bits = 0,
204 .alg_bits = 0, 204 .alg_bits = 0,
205 }, 205 },
@@ -215,7 +215,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
215 .algorithm_mac = SSL_MD5, 215 .algorithm_mac = SSL_MD5,
216 .algorithm_ssl = SSL_SSLV3, 216 .algorithm_ssl = SSL_SSLV3,
217 .algo_strength = SSL_LOW, 217 .algo_strength = SSL_LOW,
218 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 218 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
219 .strength_bits = 128, 219 .strength_bits = 128,
220 .alg_bits = 128, 220 .alg_bits = 128,
221 }, 221 },
@@ -231,7 +231,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
231 .algorithm_mac = SSL_SHA1, 231 .algorithm_mac = SSL_SHA1,
232 .algorithm_ssl = SSL_SSLV3, 232 .algorithm_ssl = SSL_SSLV3,
233 .algo_strength = SSL_LOW, 233 .algo_strength = SSL_LOW,
234 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 234 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
235 .strength_bits = 128, 235 .strength_bits = 128,
236 .alg_bits = 128, 236 .alg_bits = 128,
237 }, 237 },
@@ -247,7 +247,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
247 .algorithm_mac = SSL_SHA1, 247 .algorithm_mac = SSL_SHA1,
248 .algorithm_ssl = SSL_SSLV3, 248 .algorithm_ssl = SSL_SSLV3,
249 .algo_strength = SSL_MEDIUM, 249 .algo_strength = SSL_MEDIUM,
250 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 250 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
251 .strength_bits = 112, 251 .strength_bits = 112,
252 .alg_bits = 168, 252 .alg_bits = 168,
253 }, 253 },
@@ -267,7 +267,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
267 .algorithm_mac = SSL_SHA1, 267 .algorithm_mac = SSL_SHA1,
268 .algorithm_ssl = SSL_SSLV3, 268 .algorithm_ssl = SSL_SSLV3,
269 .algo_strength = SSL_MEDIUM, 269 .algo_strength = SSL_MEDIUM,
270 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 270 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
271 .strength_bits = 112, 271 .strength_bits = 112,
272 .alg_bits = 168, 272 .alg_bits = 168,
273 }, 273 },
@@ -283,7 +283,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
283 .algorithm_mac = SSL_MD5, 283 .algorithm_mac = SSL_MD5,
284 .algorithm_ssl = SSL_SSLV3, 284 .algorithm_ssl = SSL_SSLV3,
285 .algo_strength = SSL_LOW, 285 .algo_strength = SSL_LOW,
286 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 286 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
287 .strength_bits = 128, 287 .strength_bits = 128,
288 .alg_bits = 128, 288 .alg_bits = 128,
289 }, 289 },
@@ -299,7 +299,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
299 .algorithm_mac = SSL_SHA1, 299 .algorithm_mac = SSL_SHA1,
300 .algorithm_ssl = SSL_SSLV3, 300 .algorithm_ssl = SSL_SSLV3,
301 .algo_strength = SSL_MEDIUM, 301 .algo_strength = SSL_MEDIUM,
302 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 302 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
303 .strength_bits = 112, 303 .strength_bits = 112,
304 .alg_bits = 168, 304 .alg_bits = 168,
305 }, 305 },
@@ -319,7 +319,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
319 .algorithm_mac = SSL_SHA1, 319 .algorithm_mac = SSL_SHA1,
320 .algorithm_ssl = SSL_TLSV1, 320 .algorithm_ssl = SSL_TLSV1,
321 .algo_strength = SSL_HIGH, 321 .algo_strength = SSL_HIGH,
322 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 322 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
323 .strength_bits = 128, 323 .strength_bits = 128,
324 .alg_bits = 128, 324 .alg_bits = 128,
325 }, 325 },
@@ -335,7 +335,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
335 .algorithm_mac = SSL_SHA1, 335 .algorithm_mac = SSL_SHA1,
336 .algorithm_ssl = SSL_TLSV1, 336 .algorithm_ssl = SSL_TLSV1,
337 .algo_strength = SSL_HIGH, 337 .algo_strength = SSL_HIGH,
338 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 338 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
339 .strength_bits = 128, 339 .strength_bits = 128,
340 .alg_bits = 128, 340 .alg_bits = 128,
341 }, 341 },
@@ -351,7 +351,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
351 .algorithm_mac = SSL_SHA1, 351 .algorithm_mac = SSL_SHA1,
352 .algorithm_ssl = SSL_TLSV1, 352 .algorithm_ssl = SSL_TLSV1,
353 .algo_strength = SSL_HIGH, 353 .algo_strength = SSL_HIGH,
354 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 354 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
355 .strength_bits = 128, 355 .strength_bits = 128,
356 .alg_bits = 128, 356 .alg_bits = 128,
357 }, 357 },
@@ -367,7 +367,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
367 .algorithm_mac = SSL_SHA1, 367 .algorithm_mac = SSL_SHA1,
368 .algorithm_ssl = SSL_TLSV1, 368 .algorithm_ssl = SSL_TLSV1,
369 .algo_strength = SSL_HIGH, 369 .algo_strength = SSL_HIGH,
370 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 370 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
371 .strength_bits = 256, 371 .strength_bits = 256,
372 .alg_bits = 256, 372 .alg_bits = 256,
373 }, 373 },
@@ -383,7 +383,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
383 .algorithm_mac = SSL_SHA1, 383 .algorithm_mac = SSL_SHA1,
384 .algorithm_ssl = SSL_TLSV1, 384 .algorithm_ssl = SSL_TLSV1,
385 .algo_strength = SSL_HIGH, 385 .algo_strength = SSL_HIGH,
386 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 386 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
387 .strength_bits = 256, 387 .strength_bits = 256,
388 .alg_bits = 256, 388 .alg_bits = 256,
389 }, 389 },
@@ -399,7 +399,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
399 .algorithm_mac = SSL_SHA1, 399 .algorithm_mac = SSL_SHA1,
400 .algorithm_ssl = SSL_TLSV1, 400 .algorithm_ssl = SSL_TLSV1,
401 .algo_strength = SSL_HIGH, 401 .algo_strength = SSL_HIGH,
402 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 402 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
403 .strength_bits = 256, 403 .strength_bits = 256,
404 .alg_bits = 256, 404 .alg_bits = 256,
405 }, 405 },
@@ -416,7 +416,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
416 .algorithm_mac = SSL_SHA256, 416 .algorithm_mac = SSL_SHA256,
417 .algorithm_ssl = SSL_TLSV1_2, 417 .algorithm_ssl = SSL_TLSV1_2,
418 .algo_strength = SSL_STRONG_NONE, 418 .algo_strength = SSL_STRONG_NONE,
419 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 419 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
420 .strength_bits = 0, 420 .strength_bits = 0,
421 .alg_bits = 0, 421 .alg_bits = 0,
422 }, 422 },
@@ -432,7 +432,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
432 .algorithm_mac = SSL_SHA256, 432 .algorithm_mac = SSL_SHA256,
433 .algorithm_ssl = SSL_TLSV1_2, 433 .algorithm_ssl = SSL_TLSV1_2,
434 .algo_strength = SSL_HIGH, 434 .algo_strength = SSL_HIGH,
435 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 435 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
436 .strength_bits = 128, 436 .strength_bits = 128,
437 .alg_bits = 128, 437 .alg_bits = 128,
438 }, 438 },
@@ -448,7 +448,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
448 .algorithm_mac = SSL_SHA256, 448 .algorithm_mac = SSL_SHA256,
449 .algorithm_ssl = SSL_TLSV1_2, 449 .algorithm_ssl = SSL_TLSV1_2,
450 .algo_strength = SSL_HIGH, 450 .algo_strength = SSL_HIGH,
451 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 451 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
452 .strength_bits = 256, 452 .strength_bits = 256,
453 .alg_bits = 256, 453 .alg_bits = 256,
454 }, 454 },
@@ -467,7 +467,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
467 .algorithm_mac = SSL_SHA1, 467 .algorithm_mac = SSL_SHA1,
468 .algorithm_ssl = SSL_TLSV1, 468 .algorithm_ssl = SSL_TLSV1,
469 .algo_strength = SSL_HIGH, 469 .algo_strength = SSL_HIGH,
470 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 470 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
471 .strength_bits = 128, 471 .strength_bits = 128,
472 .alg_bits = 128, 472 .alg_bits = 128,
473 }, 473 },
@@ -483,7 +483,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
483 .algorithm_mac = SSL_SHA1, 483 .algorithm_mac = SSL_SHA1,
484 .algorithm_ssl = SSL_TLSV1, 484 .algorithm_ssl = SSL_TLSV1,
485 .algo_strength = SSL_HIGH, 485 .algo_strength = SSL_HIGH,
486 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 486 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
487 .strength_bits = 128, 487 .strength_bits = 128,
488 .alg_bits = 128, 488 .alg_bits = 128,
489 }, 489 },
@@ -499,7 +499,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
499 .algorithm_mac = SSL_SHA1, 499 .algorithm_mac = SSL_SHA1,
500 .algorithm_ssl = SSL_TLSV1, 500 .algorithm_ssl = SSL_TLSV1,
501 .algo_strength = SSL_HIGH, 501 .algo_strength = SSL_HIGH,
502 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 502 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
503 .strength_bits = 128, 503 .strength_bits = 128,
504 .alg_bits = 128, 504 .alg_bits = 128,
505 }, 505 },
@@ -517,7 +517,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
517 .algorithm_mac = SSL_SHA256, 517 .algorithm_mac = SSL_SHA256,
518 .algorithm_ssl = SSL_TLSV1_2, 518 .algorithm_ssl = SSL_TLSV1_2,
519 .algo_strength = SSL_HIGH, 519 .algo_strength = SSL_HIGH,
520 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 520 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
521 .strength_bits = 128, 521 .strength_bits = 128,
522 .alg_bits = 128, 522 .alg_bits = 128,
523 }, 523 },
@@ -533,7 +533,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
533 .algorithm_mac = SSL_SHA256, 533 .algorithm_mac = SSL_SHA256,
534 .algorithm_ssl = SSL_TLSV1_2, 534 .algorithm_ssl = SSL_TLSV1_2,
535 .algo_strength = SSL_HIGH, 535 .algo_strength = SSL_HIGH,
536 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 536 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
537 .strength_bits = 256, 537 .strength_bits = 256,
538 .alg_bits = 256, 538 .alg_bits = 256,
539 }, 539 },
@@ -549,7 +549,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
549 .algorithm_mac = SSL_SHA256, 549 .algorithm_mac = SSL_SHA256,
550 .algorithm_ssl = SSL_TLSV1_2, 550 .algorithm_ssl = SSL_TLSV1_2,
551 .algo_strength = SSL_HIGH, 551 .algo_strength = SSL_HIGH,
552 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 552 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
553 .strength_bits = 128, 553 .strength_bits = 128,
554 .alg_bits = 128, 554 .alg_bits = 128,
555 }, 555 },
@@ -565,7 +565,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
565 .algorithm_mac = SSL_SHA256, 565 .algorithm_mac = SSL_SHA256,
566 .algorithm_ssl = SSL_TLSV1_2, 566 .algorithm_ssl = SSL_TLSV1_2,
567 .algo_strength = SSL_HIGH, 567 .algo_strength = SSL_HIGH,
568 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 568 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
569 .strength_bits = 256, 569 .strength_bits = 256,
570 .alg_bits = 256, 570 .alg_bits = 256,
571 }, 571 },
@@ -584,7 +584,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
584 .algorithm_mac = SSL_SHA1, 584 .algorithm_mac = SSL_SHA1,
585 .algorithm_ssl = SSL_TLSV1, 585 .algorithm_ssl = SSL_TLSV1,
586 .algo_strength = SSL_HIGH, 586 .algo_strength = SSL_HIGH,
587 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 587 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
588 .strength_bits = 256, 588 .strength_bits = 256,
589 .alg_bits = 256, 589 .alg_bits = 256,
590 }, 590 },
@@ -600,7 +600,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
600 .algorithm_mac = SSL_SHA1, 600 .algorithm_mac = SSL_SHA1,
601 .algorithm_ssl = SSL_TLSV1, 601 .algorithm_ssl = SSL_TLSV1,
602 .algo_strength = SSL_HIGH, 602 .algo_strength = SSL_HIGH,
603 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 603 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
604 .strength_bits = 256, 604 .strength_bits = 256,
605 .alg_bits = 256, 605 .alg_bits = 256,
606 }, 606 },
@@ -616,7 +616,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
616 .algorithm_mac = SSL_SHA1, 616 .algorithm_mac = SSL_SHA1,
617 .algorithm_ssl = SSL_TLSV1, 617 .algorithm_ssl = SSL_TLSV1,
618 .algo_strength = SSL_HIGH, 618 .algo_strength = SSL_HIGH,
619 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 619 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
620 .strength_bits = 256, 620 .strength_bits = 256,
621 .alg_bits = 256, 621 .alg_bits = 256,
622 }, 622 },
@@ -637,7 +637,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
637 .algorithm_mac = SSL_AEAD, 637 .algorithm_mac = SSL_AEAD,
638 .algorithm_ssl = SSL_TLSV1_2, 638 .algorithm_ssl = SSL_TLSV1_2,
639 .algo_strength = SSL_HIGH, 639 .algo_strength = SSL_HIGH,
640 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 640 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
641 .strength_bits = 128, 641 .strength_bits = 128,
642 .alg_bits = 128, 642 .alg_bits = 128,
643 }, 643 },
@@ -653,7 +653,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
653 .algorithm_mac = SSL_AEAD, 653 .algorithm_mac = SSL_AEAD,
654 .algorithm_ssl = SSL_TLSV1_2, 654 .algorithm_ssl = SSL_TLSV1_2,
655 .algo_strength = SSL_HIGH, 655 .algo_strength = SSL_HIGH,
656 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, 656 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384,
657 .strength_bits = 256, 657 .strength_bits = 256,
658 .alg_bits = 256, 658 .alg_bits = 256,
659 }, 659 },
@@ -669,7 +669,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
669 .algorithm_mac = SSL_AEAD, 669 .algorithm_mac = SSL_AEAD,
670 .algorithm_ssl = SSL_TLSV1_2, 670 .algorithm_ssl = SSL_TLSV1_2,
671 .algo_strength = SSL_HIGH, 671 .algo_strength = SSL_HIGH,
672 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 672 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
673 .strength_bits = 128, 673 .strength_bits = 128,
674 .alg_bits = 128, 674 .alg_bits = 128,
675 }, 675 },
@@ -685,7 +685,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
685 .algorithm_mac = SSL_AEAD, 685 .algorithm_mac = SSL_AEAD,
686 .algorithm_ssl = SSL_TLSV1_2, 686 .algorithm_ssl = SSL_TLSV1_2,
687 .algo_strength = SSL_HIGH, 687 .algo_strength = SSL_HIGH,
688 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, 688 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384,
689 .strength_bits = 256, 689 .strength_bits = 256,
690 .alg_bits = 256, 690 .alg_bits = 256,
691 }, 691 },
@@ -701,7 +701,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
701 .algorithm_mac = SSL_AEAD, 701 .algorithm_mac = SSL_AEAD,
702 .algorithm_ssl = SSL_TLSV1_2, 702 .algorithm_ssl = SSL_TLSV1_2,
703 .algo_strength = SSL_HIGH, 703 .algo_strength = SSL_HIGH,
704 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 704 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
705 .strength_bits = 128, 705 .strength_bits = 128,
706 .alg_bits = 128, 706 .alg_bits = 128,
707 }, 707 },
@@ -717,7 +717,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
717 .algorithm_mac = SSL_AEAD, 717 .algorithm_mac = SSL_AEAD,
718 .algorithm_ssl = SSL_TLSV1_2, 718 .algorithm_ssl = SSL_TLSV1_2,
719 .algo_strength = SSL_HIGH, 719 .algo_strength = SSL_HIGH,
720 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, 720 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384,
721 .strength_bits = 256, 721 .strength_bits = 256,
722 .alg_bits = 256, 722 .alg_bits = 256,
723 }, 723 },
@@ -736,7 +736,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
736 .algorithm_mac = SSL_SHA256, 736 .algorithm_mac = SSL_SHA256,
737 .algorithm_ssl = SSL_TLSV1_2, 737 .algorithm_ssl = SSL_TLSV1_2,
738 .algo_strength = SSL_HIGH, 738 .algo_strength = SSL_HIGH,
739 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 739 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
740 .strength_bits = 128, 740 .strength_bits = 128,
741 .alg_bits = 128, 741 .alg_bits = 128,
742 }, 742 },
@@ -752,7 +752,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
752 .algorithm_mac = SSL_SHA256, 752 .algorithm_mac = SSL_SHA256,
753 .algorithm_ssl = SSL_TLSV1_2, 753 .algorithm_ssl = SSL_TLSV1_2,
754 .algo_strength = SSL_HIGH, 754 .algo_strength = SSL_HIGH,
755 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 755 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
756 .strength_bits = 128, 756 .strength_bits = 128,
757 .alg_bits = 128, 757 .alg_bits = 128,
758 }, 758 },
@@ -768,7 +768,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
768 .algorithm_mac = SSL_SHA256, 768 .algorithm_mac = SSL_SHA256,
769 .algorithm_ssl = SSL_TLSV1_2, 769 .algorithm_ssl = SSL_TLSV1_2,
770 .algo_strength = SSL_HIGH, 770 .algo_strength = SSL_HIGH,
771 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 771 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
772 .strength_bits = 128, 772 .strength_bits = 128,
773 .alg_bits = 128, 773 .alg_bits = 128,
774 }, 774 },
@@ -784,7 +784,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
784 .algorithm_mac = SSL_SHA256, 784 .algorithm_mac = SSL_SHA256,
785 .algorithm_ssl = SSL_TLSV1_2, 785 .algorithm_ssl = SSL_TLSV1_2,
786 .algo_strength = SSL_HIGH, 786 .algo_strength = SSL_HIGH,
787 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 787 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
788 .strength_bits = 256, 788 .strength_bits = 256,
789 .alg_bits = 256, 789 .alg_bits = 256,
790 }, 790 },
@@ -800,7 +800,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
800 .algorithm_mac = SSL_SHA256, 800 .algorithm_mac = SSL_SHA256,
801 .algorithm_ssl = SSL_TLSV1_2, 801 .algorithm_ssl = SSL_TLSV1_2,
802 .algo_strength = SSL_HIGH, 802 .algo_strength = SSL_HIGH,
803 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 803 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
804 .strength_bits = 256, 804 .strength_bits = 256,
805 .alg_bits = 256, 805 .alg_bits = 256,
806 }, 806 },
@@ -816,7 +816,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
816 .algorithm_mac = SSL_SHA256, 816 .algorithm_mac = SSL_SHA256,
817 .algorithm_ssl = SSL_TLSV1_2, 817 .algorithm_ssl = SSL_TLSV1_2,
818 .algo_strength = SSL_HIGH, 818 .algo_strength = SSL_HIGH,
819 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 819 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
820 .strength_bits = 256, 820 .strength_bits = 256,
821 .alg_bits = 256, 821 .alg_bits = 256,
822 }, 822 },
@@ -887,7 +887,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
887 .algorithm_mac = SSL_SHA1, 887 .algorithm_mac = SSL_SHA1,
888 .algorithm_ssl = SSL_TLSV1, 888 .algorithm_ssl = SSL_TLSV1,
889 .algo_strength = SSL_STRONG_NONE, 889 .algo_strength = SSL_STRONG_NONE,
890 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 890 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
891 .strength_bits = 0, 891 .strength_bits = 0,
892 .alg_bits = 0, 892 .alg_bits = 0,
893 }, 893 },
@@ -903,7 +903,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
903 .algorithm_mac = SSL_SHA1, 903 .algorithm_mac = SSL_SHA1,
904 .algorithm_ssl = SSL_TLSV1, 904 .algorithm_ssl = SSL_TLSV1,
905 .algo_strength = SSL_LOW, 905 .algo_strength = SSL_LOW,
906 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 906 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
907 .strength_bits = 128, 907 .strength_bits = 128,
908 .alg_bits = 128, 908 .alg_bits = 128,
909 }, 909 },
@@ -919,7 +919,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
919 .algorithm_mac = SSL_SHA1, 919 .algorithm_mac = SSL_SHA1,
920 .algorithm_ssl = SSL_TLSV1, 920 .algorithm_ssl = SSL_TLSV1,
921 .algo_strength = SSL_MEDIUM, 921 .algo_strength = SSL_MEDIUM,
922 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 922 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
923 .strength_bits = 112, 923 .strength_bits = 112,
924 .alg_bits = 168, 924 .alg_bits = 168,
925 }, 925 },
@@ -935,7 +935,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
935 .algorithm_mac = SSL_SHA1, 935 .algorithm_mac = SSL_SHA1,
936 .algorithm_ssl = SSL_TLSV1, 936 .algorithm_ssl = SSL_TLSV1,
937 .algo_strength = SSL_HIGH, 937 .algo_strength = SSL_HIGH,
938 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 938 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
939 .strength_bits = 128, 939 .strength_bits = 128,
940 .alg_bits = 128, 940 .alg_bits = 128,
941 }, 941 },
@@ -951,7 +951,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
951 .algorithm_mac = SSL_SHA1, 951 .algorithm_mac = SSL_SHA1,
952 .algorithm_ssl = SSL_TLSV1, 952 .algorithm_ssl = SSL_TLSV1,
953 .algo_strength = SSL_HIGH, 953 .algo_strength = SSL_HIGH,
954 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 954 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
955 .strength_bits = 256, 955 .strength_bits = 256,
956 .alg_bits = 256, 956 .alg_bits = 256,
957 }, 957 },
@@ -967,7 +967,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
967 .algorithm_mac = SSL_SHA1, 967 .algorithm_mac = SSL_SHA1,
968 .algorithm_ssl = SSL_TLSV1, 968 .algorithm_ssl = SSL_TLSV1,
969 .algo_strength = SSL_STRONG_NONE, 969 .algo_strength = SSL_STRONG_NONE,
970 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 970 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
971 .strength_bits = 0, 971 .strength_bits = 0,
972 .alg_bits = 0, 972 .alg_bits = 0,
973 }, 973 },
@@ -983,7 +983,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
983 .algorithm_mac = SSL_SHA1, 983 .algorithm_mac = SSL_SHA1,
984 .algorithm_ssl = SSL_TLSV1, 984 .algorithm_ssl = SSL_TLSV1,
985 .algo_strength = SSL_LOW, 985 .algo_strength = SSL_LOW,
986 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 986 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
987 .strength_bits = 128, 987 .strength_bits = 128,
988 .alg_bits = 128, 988 .alg_bits = 128,
989 }, 989 },
@@ -999,7 +999,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
999 .algorithm_mac = SSL_SHA1, 999 .algorithm_mac = SSL_SHA1,
1000 .algorithm_ssl = SSL_TLSV1, 1000 .algorithm_ssl = SSL_TLSV1,
1001 .algo_strength = SSL_MEDIUM, 1001 .algo_strength = SSL_MEDIUM,
1002 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1002 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1003 .strength_bits = 112, 1003 .strength_bits = 112,
1004 .alg_bits = 168, 1004 .alg_bits = 168,
1005 }, 1005 },
@@ -1015,7 +1015,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1015 .algorithm_mac = SSL_SHA1, 1015 .algorithm_mac = SSL_SHA1,
1016 .algorithm_ssl = SSL_TLSV1, 1016 .algorithm_ssl = SSL_TLSV1,
1017 .algo_strength = SSL_HIGH, 1017 .algo_strength = SSL_HIGH,
1018 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1018 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1019 .strength_bits = 128, 1019 .strength_bits = 128,
1020 .alg_bits = 128, 1020 .alg_bits = 128,
1021 }, 1021 },
@@ -1031,7 +1031,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1031 .algorithm_mac = SSL_SHA1, 1031 .algorithm_mac = SSL_SHA1,
1032 .algorithm_ssl = SSL_TLSV1, 1032 .algorithm_ssl = SSL_TLSV1,
1033 .algo_strength = SSL_HIGH, 1033 .algo_strength = SSL_HIGH,
1034 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1034 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1035 .strength_bits = 256, 1035 .strength_bits = 256,
1036 .alg_bits = 256, 1036 .alg_bits = 256,
1037 }, 1037 },
@@ -1047,7 +1047,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1047 .algorithm_mac = SSL_SHA1, 1047 .algorithm_mac = SSL_SHA1,
1048 .algorithm_ssl = SSL_TLSV1, 1048 .algorithm_ssl = SSL_TLSV1,
1049 .algo_strength = SSL_STRONG_NONE, 1049 .algo_strength = SSL_STRONG_NONE,
1050 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1050 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1051 .strength_bits = 0, 1051 .strength_bits = 0,
1052 .alg_bits = 0, 1052 .alg_bits = 0,
1053 }, 1053 },
@@ -1063,7 +1063,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1063 .algorithm_mac = SSL_SHA1, 1063 .algorithm_mac = SSL_SHA1,
1064 .algorithm_ssl = SSL_TLSV1, 1064 .algorithm_ssl = SSL_TLSV1,
1065 .algo_strength = SSL_LOW, 1065 .algo_strength = SSL_LOW,
1066 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1066 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1067 .strength_bits = 128, 1067 .strength_bits = 128,
1068 .alg_bits = 128, 1068 .alg_bits = 128,
1069 }, 1069 },
@@ -1079,7 +1079,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1079 .algorithm_mac = SSL_SHA1, 1079 .algorithm_mac = SSL_SHA1,
1080 .algorithm_ssl = SSL_TLSV1, 1080 .algorithm_ssl = SSL_TLSV1,
1081 .algo_strength = SSL_MEDIUM, 1081 .algo_strength = SSL_MEDIUM,
1082 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1082 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1083 .strength_bits = 112, 1083 .strength_bits = 112,
1084 .alg_bits = 168, 1084 .alg_bits = 168,
1085 }, 1085 },
@@ -1095,7 +1095,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1095 .algorithm_mac = SSL_SHA1, 1095 .algorithm_mac = SSL_SHA1,
1096 .algorithm_ssl = SSL_TLSV1, 1096 .algorithm_ssl = SSL_TLSV1,
1097 .algo_strength = SSL_HIGH, 1097 .algo_strength = SSL_HIGH,
1098 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1098 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1099 .strength_bits = 128, 1099 .strength_bits = 128,
1100 .alg_bits = 128, 1100 .alg_bits = 128,
1101 }, 1101 },
@@ -1111,7 +1111,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1111 .algorithm_mac = SSL_SHA1, 1111 .algorithm_mac = SSL_SHA1,
1112 .algorithm_ssl = SSL_TLSV1, 1112 .algorithm_ssl = SSL_TLSV1,
1113 .algo_strength = SSL_HIGH, 1113 .algo_strength = SSL_HIGH,
1114 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1114 .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
1115 .strength_bits = 256, 1115 .strength_bits = 256,
1116 .alg_bits = 256, 1116 .alg_bits = 256,
1117 }, 1117 },
@@ -1130,7 +1130,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1130 .algorithm_mac = SSL_SHA256, 1130 .algorithm_mac = SSL_SHA256,
1131 .algorithm_ssl = SSL_TLSV1_2, 1131 .algorithm_ssl = SSL_TLSV1_2,
1132 .algo_strength = SSL_HIGH, 1132 .algo_strength = SSL_HIGH,
1133 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 1133 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1134 .strength_bits = 128, 1134 .strength_bits = 128,
1135 .alg_bits = 128, 1135 .alg_bits = 128,
1136 }, 1136 },
@@ -1146,7 +1146,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1146 .algorithm_mac = SSL_SHA384, 1146 .algorithm_mac = SSL_SHA384,
1147 .algorithm_ssl = SSL_TLSV1_2, 1147 .algorithm_ssl = SSL_TLSV1_2,
1148 .algo_strength = SSL_HIGH, 1148 .algo_strength = SSL_HIGH,
1149 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, 1149 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384,
1150 .strength_bits = 256, 1150 .strength_bits = 256,
1151 .alg_bits = 256, 1151 .alg_bits = 256,
1152 }, 1152 },
@@ -1162,7 +1162,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1162 .algorithm_mac = SSL_SHA256, 1162 .algorithm_mac = SSL_SHA256,
1163 .algorithm_ssl = SSL_TLSV1_2, 1163 .algorithm_ssl = SSL_TLSV1_2,
1164 .algo_strength = SSL_HIGH, 1164 .algo_strength = SSL_HIGH,
1165 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 1165 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1166 .strength_bits = 128, 1166 .strength_bits = 128,
1167 .alg_bits = 128, 1167 .alg_bits = 128,
1168 }, 1168 },
@@ -1178,7 +1178,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1178 .algorithm_mac = SSL_SHA384, 1178 .algorithm_mac = SSL_SHA384,
1179 .algorithm_ssl = SSL_TLSV1_2, 1179 .algorithm_ssl = SSL_TLSV1_2,
1180 .algo_strength = SSL_HIGH, 1180 .algo_strength = SSL_HIGH,
1181 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, 1181 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384,
1182 .strength_bits = 256, 1182 .strength_bits = 256,
1183 .alg_bits = 256, 1183 .alg_bits = 256,
1184 }, 1184 },
@@ -1196,7 +1196,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1196 .algorithm_mac = SSL_AEAD, 1196 .algorithm_mac = SSL_AEAD,
1197 .algorithm_ssl = SSL_TLSV1_2, 1197 .algorithm_ssl = SSL_TLSV1_2,
1198 .algo_strength = SSL_HIGH, 1198 .algo_strength = SSL_HIGH,
1199 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 1199 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1200 .strength_bits = 128, 1200 .strength_bits = 128,
1201 .alg_bits = 128, 1201 .alg_bits = 128,
1202 }, 1202 },
@@ -1212,7 +1212,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1212 .algorithm_mac = SSL_AEAD, 1212 .algorithm_mac = SSL_AEAD,
1213 .algorithm_ssl = SSL_TLSV1_2, 1213 .algorithm_ssl = SSL_TLSV1_2,
1214 .algo_strength = SSL_HIGH, 1214 .algo_strength = SSL_HIGH,
1215 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, 1215 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384,
1216 .strength_bits = 256, 1216 .strength_bits = 256,
1217 .alg_bits = 256, 1217 .alg_bits = 256,
1218 }, 1218 },
@@ -1228,7 +1228,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1228 .algorithm_mac = SSL_AEAD, 1228 .algorithm_mac = SSL_AEAD,
1229 .algorithm_ssl = SSL_TLSV1_2, 1229 .algorithm_ssl = SSL_TLSV1_2,
1230 .algo_strength = SSL_HIGH, 1230 .algo_strength = SSL_HIGH,
1231 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 1231 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1232 .strength_bits = 128, 1232 .strength_bits = 128,
1233 .alg_bits = 128, 1233 .alg_bits = 128,
1234 }, 1234 },
@@ -1244,7 +1244,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1244 .algorithm_mac = SSL_AEAD, 1244 .algorithm_mac = SSL_AEAD,
1245 .algorithm_ssl = SSL_TLSV1_2, 1245 .algorithm_ssl = SSL_TLSV1_2,
1246 .algo_strength = SSL_HIGH, 1246 .algo_strength = SSL_HIGH,
1247 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, 1247 .algorithm2 = SSL_HANDSHAKE_MAC_SHA384,
1248 .strength_bits = 256, 1248 .strength_bits = 256,
1249 .alg_bits = 256, 1249 .alg_bits = 256,
1250 }, 1250 },
@@ -1260,7 +1260,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1260 .algorithm_mac = SSL_AEAD, 1260 .algorithm_mac = SSL_AEAD,
1261 .algorithm_ssl = SSL_TLSV1_2, 1261 .algorithm_ssl = SSL_TLSV1_2,
1262 .algo_strength = SSL_HIGH, 1262 .algo_strength = SSL_HIGH,
1263 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 1263 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1264 .strength_bits = 256, 1264 .strength_bits = 256,
1265 .alg_bits = 256, 1265 .alg_bits = 256,
1266 }, 1266 },
@@ -1276,7 +1276,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1276 .algorithm_mac = SSL_AEAD, 1276 .algorithm_mac = SSL_AEAD,
1277 .algorithm_ssl = SSL_TLSV1_2, 1277 .algorithm_ssl = SSL_TLSV1_2,
1278 .algo_strength = SSL_HIGH, 1278 .algo_strength = SSL_HIGH,
1279 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 1279 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1280 .strength_bits = 256, 1280 .strength_bits = 256,
1281 .alg_bits = 256, 1281 .alg_bits = 256,
1282 }, 1282 },
@@ -1292,7 +1292,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1292 .algorithm_mac = SSL_AEAD, 1292 .algorithm_mac = SSL_AEAD,
1293 .algorithm_ssl = SSL_TLSV1_2, 1293 .algorithm_ssl = SSL_TLSV1_2,
1294 .algo_strength = SSL_HIGH, 1294 .algo_strength = SSL_HIGH,
1295 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, 1295 .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1296 .strength_bits = 256, 1296 .strength_bits = 256,
1297 .alg_bits = 256, 1297 .alg_bits = 256,
1298 }, 1298 },
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h
index db102212a8..74c6ad33ee 100644
--- a/src/lib/libssl/ssl_local.h
+++ b/src/lib/libssl/ssl_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_local.h,v 1.17 2024/06/25 14:10:45 jsing Exp $ */ 1/* $OpenBSD: ssl_local.h,v 1.18 2024/07/15 14:45:15 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 *
@@ -255,15 +255,6 @@ __BEGIN_HIDDEN_DECLS
255#define SSL3_CK_ID 0x03000000 255#define SSL3_CK_ID 0x03000000
256#define SSL3_CK_VALUE_MASK 0x0000ffff 256#define SSL3_CK_VALUE_MASK 0x0000ffff
257 257
258#define TLS1_PRF_DGST_MASK (0xff << TLS1_PRF_DGST_SHIFT)
259
260#define TLS1_PRF_DGST_SHIFT 10
261#define TLS1_PRF_MD5 (SSL_HANDSHAKE_MAC_MD5 << TLS1_PRF_DGST_SHIFT)
262#define TLS1_PRF_SHA1 (SSL_HANDSHAKE_MAC_SHA << TLS1_PRF_DGST_SHIFT)
263#define TLS1_PRF_SHA256 (SSL_HANDSHAKE_MAC_SHA256 << TLS1_PRF_DGST_SHIFT)
264#define TLS1_PRF_SHA384 (SSL_HANDSHAKE_MAC_SHA384 << TLS1_PRF_DGST_SHIFT)
265#define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1)
266
267/* 258/*
268 * Cipher strength information. 259 * Cipher strength information.
269 */ 260 */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 00:33:12 +0000