[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a8e75d56804540dfc588bad9cf1c412c675cab89 (commit)
      from  a4750ce55e7d6451c187b5ab9ccf5218e0851eeb (commit)


- Log -----------------------------------------------------------------
commit a8e75d56804540dfc588bad9cf1c412c675cab89
Author: Kazuki Yamaguchi <k at rhe.jp>
Date:   Fri Mar 31 01:54:39 2017 +0900

    Fix a typo in the SSL_get_max_early_data() declarations
    
    SSL_get_max_early_data() recently added by 3fc8d856105e ("Construct the
    ticket_early_data_info extension", 2017-02-17) is supposed to take an
    SSL, but it doesn't.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3113)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/SSL_read_early_data.pod | 2 +-
 include/openssl/ssl.h            | 2 +-
 ssl/ssl_lib.c                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/man3/SSL_read_early_data.pod b/doc/man3/SSL_read_early_data.pod
index 4567de7..dd57cef 100644
--- a/doc/man3/SSL_read_early_data.pod
+++ b/doc/man3/SSL_read_early_data.pod
@@ -19,7 +19,7 @@ SSL_get_early_data_status
  int SSL_CTX_set_max_early_data(SSL_CTX *ctx, uint32_t max_early_data);
  uint32_t SSL_CTX_get_max_early_data(const SSL_CTX *ctx);
  int SSL_set_max_early_data(SSL *s, uint32_t max_early_data);
- uint32_t SSL_get_max_early_data(const SSL_CTX *s);
+ uint32_t SSL_get_max_early_data(const SSL *s);
  uint32_t SSL_SESSION_get_max_early_data(const SSL_SESSION *s);
 
  int SSL_write_early_data(SSL *s, const void *buf, size_t num, size_t *written);
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 1041e3c..b1a8c69 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -800,7 +800,7 @@ SSL_CTX_keylog_cb_func SSL_CTX_get_keylog_callback(const SSL_CTX *ctx);
 int SSL_CTX_set_max_early_data(SSL_CTX *ctx, uint32_t max_early_data);
 uint32_t SSL_CTX_get_max_early_data(const SSL_CTX *ctx);
 int SSL_set_max_early_data(SSL *s, uint32_t max_early_data);
-uint32_t SSL_get_max_early_data(const SSL_CTX *s);
+uint32_t SSL_get_max_early_data(const SSL *s);
 
 #ifdef __cplusplus
 }
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index a76ee40..61e1a7a 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -4810,7 +4810,7 @@ int SSL_set_max_early_data(SSL *s, uint32_t max_early_data)
     return 1;
 }
 
-uint32_t SSL_get_max_early_data(const SSL_CTX *s)
+uint32_t SSL_get_max_early_data(const SSL *s)
 {
     return s->max_early_data;
 }