diff options
author | jsing <> | 2017-10-12 15:52:50 +0000 |
---|---|---|
committer | jsing <> | 2017-10-12 15:52:50 +0000 |
commit | 6492e6ac4af9a012fb3257450b5bb92e7a5b4554 (patch) | |
tree | 1093c3d22332b5684b872848e862f8389752b31e /src/lib/libssl/ssl_locl.h | |
parent | 791837ff802d1b53615622a89e9ac0b79a61eb27 (diff) | |
download | openbsd-6492e6ac4af9a012fb3257450b5bb92e7a5b4554.tar.gz openbsd-6492e6ac4af9a012fb3257450b5bb92e7a5b4554.tar.bz2 openbsd-6492e6ac4af9a012fb3257450b5bb92e7a5b4554.zip |
Fold dtls1_accept() into ssl_accept(), removing a lot of duplicated code.
With review/feedback from 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 5e3872ba49..044822c32c 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.199 2017/10/12 15:44:18 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.200 2017/10/12 15:52:50 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 | * |
@@ -1209,6 +1209,7 @@ int ssl3_check_cert_and_algorithm(SSL *s); | |||
1209 | int ssl3_check_finished(SSL *s); | 1209 | int ssl3_check_finished(SSL *s); |
1210 | 1210 | ||
1211 | /* some server-only functions */ | 1211 | /* some server-only functions */ |
1212 | int dtls1_send_hello_verify_request(SSL *s); | ||
1212 | int ssl3_get_client_hello(SSL *s); | 1213 | int ssl3_get_client_hello(SSL *s); |
1213 | int ssl3_send_server_hello(SSL *s); | 1214 | int ssl3_send_server_hello(SSL *s); |
1214 | int ssl3_send_hello_request(SSL *s); | 1215 | int ssl3_send_hello_request(SSL *s); |
@@ -1224,7 +1225,6 @@ void tls1_free(SSL *s); | |||
1224 | void tls1_clear(SSL *s); | 1225 | void tls1_clear(SSL *s); |
1225 | 1226 | ||
1226 | int dtls1_new(SSL *s); | 1227 | int dtls1_new(SSL *s); |
1227 | int dtls1_accept(SSL *s); | ||
1228 | void dtls1_free(SSL *s); | 1228 | void dtls1_free(SSL *s); |
1229 | void dtls1_clear(SSL *s); | 1229 | void dtls1_clear(SSL *s); |
1230 | long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg); | 1230 | long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg); |