summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2017-10-12 16:06:32 +0000
committerjsing <>2017-10-12 16:06:32 +0000
commit31480a4cf9b7421dfffa30591096c6e8854f1638 (patch)
tree2c9aee930b512232633c3502f89bed49814555d8
parent6492e6ac4af9a012fb3257450b5bb92e7a5b4554 (diff)
downloadopenbsd-31480a4cf9b7421dfffa30591096c6e8854f1638.tar.gz
openbsd-31480a4cf9b7421dfffa30591096c6e8854f1638.tar.bz2
openbsd-31480a4cf9b7421dfffa30591096c6e8854f1638.zip
Rename ssl3_client_hello() to ssl3_send_client_hello() for consistency.
-rw-r--r--src/lib/libssl/ssl_clnt.c6
-rw-r--r--src/lib/libssl/ssl_locl.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 33352705d1..56ea99d82e 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.21 2017/10/11 17:35:00 jsing Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.22 2017/10/12 16:06:32 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 *
@@ -277,7 +277,7 @@ ssl3_connect(SSL *s)
277 dtls1_start_timer(s); 277 dtls1_start_timer(s);
278 } 278 }
279 279
280 ret = ssl3_client_hello(s); 280 ret = ssl3_send_client_hello(s);
281 if (ret <= 0) 281 if (ret <= 0)
282 goto end; 282 goto end;
283 283
@@ -661,7 +661,7 @@ end:
661} 661}
662 662
663int 663int
664ssl3_client_hello(SSL *s) 664ssl3_send_client_hello(SSL *s)
665{ 665{
666 CBB cbb, client_hello, session_id, cookie, cipher_suites; 666 CBB cbb, client_hello, session_id, cookie, cipher_suites;
667 CBB compression_methods; 667 CBB compression_methods;
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 044822c32c..f6e922e99c 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.200 2017/10/12 15:52:50 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.201 2017/10/12 16:06:32 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 *
@@ -1193,7 +1193,7 @@ unsigned int dtls1_min_mtu(void);
1193 1193
1194/* some client-only functions */ 1194/* some client-only functions */
1195int dtls1_get_hello_verify(SSL *s); 1195int dtls1_get_hello_verify(SSL *s);
1196int ssl3_client_hello(SSL *s); 1196int ssl3_send_client_hello(SSL *s);
1197int ssl3_get_server_hello(SSL *s); 1197int ssl3_get_server_hello(SSL *s);
1198int ssl3_get_certificate_request(SSL *s); 1198int ssl3_get_certificate_request(SSL *s);
1199int ssl3_get_new_session_ticket(SSL *s); 1199int ssl3_get_new_session_ticket(SSL *s);