[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e86e76a6c4744244104838700eebeb54209b5827 (commit)
       via  3b7a57589748b2e02df88eaf6ba89194c84975d0 (commit)
       via  b4c1d72e9f4fd47581d2231906b9d45bc003cb3b (commit)
      from  2301d91dd58d9827865e360d616291f2549ec5bf (commit)


- Log -----------------------------------------------------------------
commit e86e76a6c4744244104838700eebeb54209b5827
Author: jamercee <jim at carroll.com>
Date:   Thu Aug 4 17:04:32 2016 -0400

    Fixed typo
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1386)

commit 3b7a57589748b2e02df88eaf6ba89194c84975d0
Author: JimC <jim at carroll.com>
Date:   Thu Aug 4 06:53:02 2016 -0400

    Documented BIO_set_accept_port()/BIO_get_accept_port()
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1386)

commit b4c1d72e9f4fd47581d2231906b9d45bc003cb3b
Author: jamercee <jim at carroll.com>
Date:   Wed Aug 3 11:31:46 2016 -0400

    Adapt BIO_new_accept() to call BIO_set_accept_name()
    
    Commit 417be66 broken BIO_new_accept() by changing the definition of the
    macro BIO_set_accept_port() which stopped acpt_ctrl() from calling
    BIO_parse_hostserv(). This commit completes the series of changes
    initiated in 417be66.
    
    Updated pods to reflect new definition introduced by 417be66.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1386)

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

Summary of changes:
 crypto/bio/bss_acpt.c       |  2 +-
 doc/crypto/BIO_s_accept.pod | 38 +++++++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 628da9e..6fb971a 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -548,7 +548,7 @@ BIO *BIO_new_accept(const char *str)
     ret = BIO_new(BIO_s_accept());
     if (ret == NULL)
         return (NULL);
-    if (BIO_set_accept_port(ret, str))
+    if (BIO_set_accept_name(ret, str))
         return (ret);
     BIO_free(ret);
     return (NULL);
diff --git a/doc/crypto/BIO_s_accept.pod b/doc/crypto/BIO_s_accept.pod
index 724f148..5a908ac 100644
--- a/doc/crypto/BIO_s_accept.pod
+++ b/doc/crypto/BIO_s_accept.pod
@@ -2,9 +2,9 @@
 
 =head1 NAME
 
-BIO_s_accept, BIO_set_accept_port, BIO_get_accept_port, BIO_new_accept,
-BIO_set_nbio_accept, BIO_set_accept_bios, BIO_set_bind_mode,
-BIO_get_bind_mode, BIO_do_accept - accept BIO
+BIO_s_accept, BIO_set_accept_name, BIO_get_name, BIO_set_accept_port,
+BIO_get_accept_port, BIO_new_accept, BIO_set_nbio_accept, BIO_set_accept_bios,
+BIO_set_bind_mode, BIO_get_bind_mode, BIO_do_accept - accept BIO
 
 =head1 SYNOPSIS
 
@@ -12,7 +12,10 @@ BIO_get_bind_mode, BIO_do_accept - accept BIO
 
  const BIO_METHOD *BIO_s_accept(void);
 
- long BIO_set_accept_port(BIO *b, char *name);
+ long BIO_set_accept_name(BIO *b, char *name);
+ char *BIO_get_accept_name(BIO *b);
+
+ long BIO_set_accept_port(BIO *b, char *port);
  char *BIO_get_accept_port(BIO *b);
 
  BIO *BIO_new_accept(char *host_port);
@@ -52,8 +55,8 @@ incoming connection.
 BIO_get_fd() and BIO_set_fd() can be called to retrieve or set
 the accept socket. See L<BIO_s_fd(3)>
 
-BIO_set_accept_port() uses the string B<name> to set the accept
-port. The port is represented as a string of the form "host:port",
+BIO_set_accept_name() uses the string B<name> to set the accept
+name. The name is represented as a string of the form "host:port",
 where "host" is the interface to use and "port" is the port.
 The host can be "*" or empty which is interpreted as meaning
 any interface.  If the host is an IPv6 address, it has to be
@@ -62,7 +65,13 @@ same syntax as the port specified in BIO_set_conn_port() for
 connect BIOs, that is it can be a numerical port string or a
 string to lookup using getservbyname() and a string table.
 
-BIO_new_accept() combines BIO_new() and BIO_set_accept_port() into
+BIO_set_accept_port() uses the string B<port> to set the accept
+port.  "port" has the same syntax as the port specified in
+BIO_set_conn_port() for connect BIOs, that is it can be a numerical
+port string or a string to lookup using getservbyname() and a string
+table.
+
+BIO_new_accept() combines BIO_new() and BIO_set_accept_name() into
 a single call: that is it creates a new accept BIO with port
 B<host_port>.
 
@@ -134,17 +143,20 @@ then it is an indication that an accept attempt would block: the application
 should take appropriate action to wait until the underlying socket has
 accepted a connection and retry the call.
 
-BIO_set_accept_port(), BIO_get_accept_port(), BIO_set_nbio_accept(),
-BIO_set_accept_bios(), BIO_set_bind_mode(), BIO_get_bind_mode() and
-BIO_do_accept() are macros.
+BIO_set_accept_name(), BIO_get_accept_name(), BIO_set_accept_port(),
+BIO_get_accept_port(), BIO_set_nbio_accept(), BIO_set_accept_bios(),
+BIO_set_bind_mode(), BIO_get_bind_mode() and BIO_do_accept() are macros.
 
 =head1 RETURN VALUES
 
 BIO_do_accept(),
-BIO_set_accept_port(), BIO_set_nbio_accept(), BIO_set_accept_bios(),
-and BIO_set_bind_mode(), return 1 for success and 0 or -1 for failure.
+BIO_set_accept_name(), BIO_set_accept_port(), BIO_set_nbio_accept(),
+BIO_set_accept_bios(), and BIO_set_bind_mode(), return 1 for success and 0 or
+-1 for failure.
+
+BIO_get_accept_name() returns the accept name or NULL on error.
 
-BIO_get_accept_port() returns the port name or NULL on error.
+BIO_get_accept_port() returns the port as a string or NULL on error.
 
 BIO_get_bind_mode() returns the set of B<BIO_BIND> flags, or -1 on failure.