diff options
author | jsing <> | 2021-04-21 19:27:56 +0000 |
---|---|---|
committer | jsing <> | 2021-04-21 19:27:56 +0000 |
commit | c0fa404c22925c9af0bc614df8099126ce54eee8 (patch) | |
tree | 00c27f46eb336858aa2f95e55eb1b6f71cb3c869 /src/lib/libssl/ssl_cert.c | |
parent | 82f5c0f3ecd6365b1fe8cbd40e7c8bf23ee55632 (diff) | |
download | openbsd-c0fa404c22925c9af0bc614df8099126ce54eee8.tar.gz openbsd-c0fa404c22925c9af0bc614df8099126ce54eee8.tar.bz2 openbsd-c0fa404c22925c9af0bc614df8099126ce54eee8.zip |
Clean up TLSv1.2 certificate request handshake data.
Currently cert_req is used by clients and cert_request is used by servers.
Replace this by a single cert_request used by either client or server.
Remove the certificate types as they are currently unused. This also fixes
a bug whereby if the number of certificate types exceeds SSL3_CT_NUMBER
the number of bytes read in is insufficient, which will break decoding.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r-- | src/lib/libssl/ssl_cert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 03ef8565ac..d122c80f2c 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.81 2021/03/27 17:56:28 tb Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.82 2021/04/21 19:27:56 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 | * |
@@ -508,7 +508,7 @@ SSL_get_client_CA_list(const SSL *s) | |||
508 | if (!s->server) { | 508 | if (!s->server) { |
509 | /* We are in the client. */ | 509 | /* We are in the client. */ |
510 | if ((s->version >> 8) == SSL3_VERSION_MAJOR) | 510 | if ((s->version >> 8) == SSL3_VERSION_MAJOR) |
511 | return (S3I(s)->tmp.ca_names); | 511 | return (S3I(s)->hs.tls12.ca_names); |
512 | else | 512 | else |
513 | return (NULL); | 513 | return (NULL); |
514 | } else { | 514 | } else { |