Remove the 'ssl_' prefix on most SSL_PROTOCOL_METHOD hooks. It doesn't really convey anything useful. Leave ssl_get_message alone for now since it's called everywhere in the handshake and I'm about to tweak it further. Change-Id: I6f3a74c170e818f624be8fbe5cf6b796353406df Reviewed-on: https://boringssl-review.googlesource.com/8430 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 5da339d..a7070d1 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c
@@ -642,7 +642,7 @@ } } - return ssl->method->ssl_read_app_data(ssl, buf, num, peek); + return ssl->method->read_app_data(ssl, buf, num, peek); } int SSL_read(SSL *ssl, void *buf, int num) { @@ -681,7 +681,7 @@ } } - return ssl->method->ssl_write_app_data(ssl, buf, num); + return ssl->method->write_app_data(ssl, buf, num); } int SSL_shutdown(SSL *ssl) { @@ -719,12 +719,12 @@ } } else if (ssl->s3->alert_dispatch) { /* Finish sending the close_notify. */ - if (ssl->method->ssl_dispatch_alert(ssl) <= 0) { + if (ssl->method->dispatch_alert(ssl) <= 0) { return -1; } } else if (ssl->s3->recv_shutdown != ssl_shutdown_close_notify) { /* Wait for the peer's close_notify. */ - ssl->method->ssl_read_close_notify(ssl); + ssl->method->read_close_notify(ssl); if (ssl->s3->recv_shutdown != ssl_shutdown_close_notify) { return -1; }