[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a01dbac232166563cdeafcbe31f321c05d164a10 (commit)
      from  69687aa829bc8bdcaf5468eb3dd0ada13700b7aa (commit)


- Log -----------------------------------------------------------------
commit a01dbac232166563cdeafcbe31f321c05d164a10
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Mar 28 16:31:54 2017 -0400

    Remove duplicate doc
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3068)

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

Summary of changes:
 doc/man3/SSL_CTX_set_ex_data.pod | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/doc/man3/SSL_CTX_set_ex_data.pod b/doc/man3/SSL_CTX_set_ex_data.pod
index cb88ea0..fd0364b 100644
--- a/doc/man3/SSL_CTX_set_ex_data.pod
+++ b/doc/man3/SSL_CTX_set_ex_data.pod
@@ -3,8 +3,7 @@
 =head1 NAME
 
 SSL_CTX_get_ex_data, SSL_CTX_set_ex_data,
-SSL_get_ex_data, SSL_set_ex_data,
-SSL_SESSION_get_ex_data, SSL_SESSION_set_ex_data
+SSL_get_ex_data, SSL_set_ex_data
 - Store and retrieve extra data from the SSL_CTX, SSL or SSL_SESSION
 
 =head1 SYNOPSIS
@@ -19,14 +18,10 @@ SSL_SESSION_get_ex_data, SSL_SESSION_set_ex_data
 
  int SSL_set_ex_data(SSL *s, int idx, void *arg);
 
- int SSL_SESSION_set_ex_data(SSL_SESSION *s, int idx, void *arg);
-
- void *SSL_SESSION_get_ex_data(const SSL_SESSION *s, int idx);
-
 =head1 DESCRIPTION
 
 SSL*_set_ex_data() functions can be used to store arbitrary user data into the
-B<SSL_CTX>, B<SSL> or B<SSL_SESSION>. The user must supply a unique index
+B<SSL_CTX>, or B<SSL> object. The user must supply a unique index
 which they can subsequently use to retrieve the data using SSL*_get_ex_data().
 
 For more detailed information see L<CRYPTO_get_ex_data(3)> and