diff options
author | jsing <> | 2017-10-10 15:13:26 +0000 |
---|---|---|
committer | jsing <> | 2017-10-10 15:13:26 +0000 |
commit | 50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f (patch) | |
tree | f95f7f0c3a406dd1dd25069a69ae5946e7eb8ad5 /src/lib/libssl/ssl_locl.h | |
parent | dd1d617d105867f42195ad190923c6c1fe92e710 (diff) | |
download | openbsd-50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f.tar.gz openbsd-50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f.tar.bz2 openbsd-50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f.zip |
Merge dtls1_connect() into ssl3_connect(), removing a large amount of
duplicated code. For now this is essentially adds a diff of the two
functions with 'if (SSL_IS_DTLS(s))' - further clean up and improvement
will follow.
ok inoguchi@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 2fec36fba9..eed0803a85 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.194 2017/10/08 16:24:02 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.195 2017/10/10 15:13:26 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 | * |
@@ -1199,6 +1199,7 @@ void dtls1_double_timeout(SSL *s); | |||
1199 | unsigned int dtls1_min_mtu(void); | 1199 | unsigned int dtls1_min_mtu(void); |
1200 | 1200 | ||
1201 | /* some client-only functions */ | 1201 | /* some client-only functions */ |
1202 | int dtls1_get_hello_verify(SSL *s); | ||
1202 | int ssl3_client_hello(SSL *s); | 1203 | int ssl3_client_hello(SSL *s); |
1203 | int ssl3_get_server_hello(SSL *s); | 1204 | int ssl3_get_server_hello(SSL *s); |
1204 | int ssl3_get_certificate_request(SSL *s); | 1205 | int ssl3_get_certificate_request(SSL *s); |
@@ -1236,7 +1237,6 @@ void tls1_clear(SSL *s); | |||
1236 | 1237 | ||
1237 | int dtls1_new(SSL *s); | 1238 | int dtls1_new(SSL *s); |
1238 | int dtls1_accept(SSL *s); | 1239 | int dtls1_accept(SSL *s); |
1239 | int dtls1_connect(SSL *s); | ||
1240 | void dtls1_free(SSL *s); | 1240 | void dtls1_free(SSL *s); |
1241 | void dtls1_clear(SSL *s); | 1241 | void dtls1_clear(SSL *s); |
1242 | long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg); | 1242 | long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg); |