summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/t1_lib.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 1fe3c1cde4..de4cbaa932 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.201 2025/01/18 13:11:58 tb Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.202 2025/01/18 13:15:31 tb 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 *
@@ -128,9 +128,9 @@ int
128tls1_new(SSL *s) 128tls1_new(SSL *s)
129{ 129{
130 if (!ssl3_new(s)) 130 if (!ssl3_new(s))
131 return (0); 131 return 0;
132 s->method->ssl_clear(s); 132 s->method->ssl_clear(s);
133 return (1); 133 return 1;
134} 134}
135 135
136void 136void
@@ -632,22 +632,22 @@ tls1_set_ec_id(uint16_t *group_id, uint8_t *comp_id, EC_KEY *ec)
632 int nid; 632 int nid;
633 633
634 if ((grp = EC_KEY_get0_group(ec)) == NULL) 634 if ((grp = EC_KEY_get0_group(ec)) == NULL)
635 return (0); 635 return 0;
636 636
637 /* Determine group ID. */ 637 /* Determine group ID. */
638 nid = EC_GROUP_get_curve_name(grp); 638 nid = EC_GROUP_get_curve_name(grp);
639 if (!tls1_ec_nid2group_id(nid, group_id)) 639 if (!tls1_ec_nid2group_id(nid, group_id))
640 return (0); 640 return 0;
641 641
642 /* Specify the compression identifier. */ 642 /* Specify the compression identifier. */
643 if (EC_KEY_get0_public_key(ec) == NULL) 643 if (EC_KEY_get0_public_key(ec) == NULL)
644 return (0); 644 return 0;
645 *comp_id = TLSEXT_ECPOINTFORMAT_uncompressed; 645 *comp_id = TLSEXT_ECPOINTFORMAT_uncompressed;
646 if (EC_KEY_get_conv_form(ec) == POINT_CONVERSION_COMPRESSED) { 646 if (EC_KEY_get_conv_form(ec) == POINT_CONVERSION_COMPRESSED) {
647 *comp_id = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime; 647 *comp_id = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime;
648 } 648 }
649 649
650 return (1); 650 return 1;
651} 651}
652 652
653/* Check that an EC key is compatible with extensions. */ 653/* Check that an EC key is compatible with extensions. */
@@ -669,7 +669,7 @@ tls1_check_ec_key(SSL *s, const uint16_t *group_id, const uint8_t *comp_id)
669 break; 669 break;
670 } 670 }
671 if (i == formatslen) 671 if (i == formatslen)
672 return (0); 672 return 0;
673 } 673 }
674 674
675 /* 675 /*
@@ -682,10 +682,10 @@ tls1_check_ec_key(SSL *s, const uint16_t *group_id, const uint8_t *comp_id)
682 break; 682 break;
683 } 683 }
684 if (i == groupslen) 684 if (i == groupslen)
685 return (0); 685 return 0;
686 } 686 }
687 687
688 return (1); 688 return 1;
689} 689}
690 690
691/* Check EC server key is compatible with client extensions. */ 691/* Check EC server key is compatible with client extensions. */
@@ -699,13 +699,13 @@ tls1_check_ec_server_key(SSL *s)
699 EVP_PKEY *pkey; 699 EVP_PKEY *pkey;
700 700
701 if (cpk->x509 == NULL || cpk->privatekey == NULL) 701 if (cpk->x509 == NULL || cpk->privatekey == NULL)
702 return (0); 702 return 0;
703 if ((pkey = X509_get0_pubkey(cpk->x509)) == NULL) 703 if ((pkey = X509_get0_pubkey(cpk->x509)) == NULL)
704 return (0); 704 return 0;
705 if ((eckey = EVP_PKEY_get0_EC_KEY(pkey)) == NULL) 705 if ((eckey = EVP_PKEY_get0_EC_KEY(pkey)) == NULL)
706 return (0); 706 return 0;
707 if (!tls1_set_ec_id(&group_id, &comp_id, eckey)) 707 if (!tls1_set_ec_id(&group_id, &comp_id, eckey))
708 return (0); 708 return 0;
709 709
710 return tls1_check_ec_key(s, &group_id, &comp_id); 710 return tls1_check_ec_key(s, &group_id, &comp_id);
711} 711}