diff options
| author |   jsing <jsing@openbsd.org> | 2020-10-11 02:22:27 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-10-11 02:22:27 +0000 |
| commit | 9fef1c44a60220d617ce7edb2d07c208216a8adb (patch) | |
| tree | 41ca77d30fb3113c1770c03ca4e5c9e2e66abab1 /lib/libssl/ssl_clnt.c | |
| parent | Unbreak regress following SRTP_PROTECTION_PROFILE const change. (diff) | |
| download | wireguard-openbsd-9fef1c44a60220d617ce7edb2d07c208216a8adb.tar.xz wireguard-openbsd-9fef1c44a60220d617ce7edb2d07c208216a8adb.zip | |
Condense and simplify TLS methods.
Historically, OpenSSL has had client and server specific methods - the only
difference between these is that the .ssl_connect or .ssl_accept function
pointer is set to ssl_undefined_function, with the intention of reducing
code size for a statically linked binary that was only a client or server.
These days the difference is minimal or non-existant in many cases and
we can reduce the amount of code and complexity by having single method.
Internally remove all of the client and server specific methods,
simplifying code in the process. The external client/server specific API
remain, however these now return the same thing as TLS_method() does.
ok tb@
Diffstat (limited to 'lib/libssl/ssl_clnt.c')
| -rw-r--r-- | lib/libssl/ssl_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/ssl_clnt.c b/lib/libssl/ssl_clnt.c index 3d11aaaf363..88b82c44004 100644 --- a/lib/libssl/ssl_clnt.c +++ b/lib/libssl/ssl_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_clnt.c,v 1.74 2020/10/03 18:01:55 jsing Exp $ */ +/* $OpenBSD: ssl_clnt.c,v 1.75 2020/10/11 02:22:27 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -911,7 +911,7 @@ ssl3_get_server_hello(SSL *s) } s->version = server_version; - if ((method = ssl_get_client_method(server_version)) == NULL) { + if ((method = ssl_get_method(server_version)) == NULL) { SSLerror(s, ERR_R_INTERNAL_ERROR); goto err; } |