diff options
| author | Matt Caswell <matt@openssl.org> | 2017-03-02 14:42:55 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-02 17:44:16 +0000 |
| commit | f533fbd44a36daac9cc304ff648782e366391b00 (patch) | |
| tree | 43cb39ba3b60bd4fec763464082600971e2df208 /include | |
| parent | ef466accdc196fe796301a06cdc6e94cb315ae9b (diff) | |
Rename SSL_read_early() to SSL_read_early_data()
This is for consistency with the rest of the API where all the functions
are called *early_data*.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2737)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 8445ccd03c..1829c5b813 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1615,11 +1615,12 @@ __owur int SSL_connect(SSL *ssl); __owur int SSL_read(SSL *ssl, void *buf, int num); __owur int SSL_read_ex(SSL *ssl, void *buf, size_t num, size_t *readbytes); -# define SSL_READ_EARLY_ERROR 0 -# define SSL_READ_EARLY_SUCCESS 1 -# define SSL_READ_EARLY_FINISH 2 +# define SSL_READ_EARLY_DATA_ERROR 0 +# define SSL_READ_EARLY_DATA_SUCCESS 1 +# define SSL_READ_EARLY_DATA_FINISH 2 -__owur int SSL_read_early(SSL *s, void *buf, size_t num, size_t *readbytes); +__owur int SSL_read_early_data(SSL *s, void *buf, size_t num, + size_t *readbytes); __owur int SSL_peek(SSL *ssl, void *buf, int num); __owur int SSL_peek_ex(SSL *ssl, void *buf, size_t num, size_t *readbytes); __owur int SSL_write(SSL *ssl, const void *buf, int num); @@ -2270,7 +2271,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_SSL_PEEK_EX 432 # define SSL_F_SSL_PEEK_INTERNAL 522 # define SSL_F_SSL_READ 223 -# define SSL_F_SSL_READ_EARLY 529 +# define SSL_F_SSL_READ_EARLY_DATA 529 # define SSL_F_SSL_READ_EX 434 # define SSL_F_SSL_READ_INTERNAL 523 # define SSL_F_SSL_RENEGOTIATE 516 |