diff options
author | tb <> | 2024-03-02 11:46:55 +0000 |
---|---|---|
committer | tb <> | 2024-03-02 11:46:55 +0000 |
commit | 3e5e7f2a269ad388a1b8199d25b80d3a62e57e92 (patch) | |
tree | f3a156ff7fdf4beb4ece3ebd30ce13b3acca00fd /src/lib/libssl/s3_lib.c | |
parent | 17dd058fa6a2fcf296d19d4fca23180abec5ba40 (diff) | |
download | openbsd-3e5e7f2a269ad388a1b8199d25b80d3a62e57e92.tar.gz openbsd-3e5e7f2a269ad388a1b8199d25b80d3a62e57e92.tar.bz2 openbsd-3e5e7f2a269ad388a1b8199d25b80d3a62e57e92.zip |
Make {SSL3,TLS}_CT_* internal
And here goes a bunch of unused macros that just had to be in two
headers so they could get out of sync. Three of these constants
are used in a single function...
ok jsing
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 9836d20bd0..6ebe2605da 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.250 2024/03/02 11:44:47 tb Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.251 2024/03/02 11:46:55 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 | * |
@@ -2594,6 +2594,10 @@ ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, | |||
2594 | return (ret); | 2594 | return (ret); |
2595 | } | 2595 | } |
2596 | 2596 | ||
2597 | #define SSL3_CT_RSA_SIGN 1 | ||
2598 | #define SSL3_CT_RSA_FIXED_DH 3 | ||
2599 | #define SSL3_CT_ECDSA_SIGN 64 | ||
2600 | |||
2597 | int | 2601 | int |
2598 | ssl3_get_req_cert_types(SSL *s, CBB *cbb) | 2602 | ssl3_get_req_cert_types(SSL *s, CBB *cbb) |
2599 | { | 2603 | { |
@@ -2613,7 +2617,7 @@ ssl3_get_req_cert_types(SSL *s, CBB *cbb) | |||
2613 | * ECDSA certs can be used with RSA cipher suites as well | 2617 | * ECDSA certs can be used with RSA cipher suites as well |
2614 | * so we don't need to check for SSL_kECDH or SSL_kECDHE. | 2618 | * so we don't need to check for SSL_kECDH or SSL_kECDHE. |
2615 | */ | 2619 | */ |
2616 | if (!CBB_add_u8(cbb, TLS_CT_ECDSA_SIGN)) | 2620 | if (!CBB_add_u8(cbb, SSL3_CT_ECDSA_SIGN)) |
2617 | return 0; | 2621 | return 0; |
2618 | 2622 | ||
2619 | return 1; | 2623 | return 1; |