BIO_do_accept: correct error return value

[openssl.git] / crypto / bio / bss_acpt.c

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 8cd66fe1ee0757200e2fe29f60657e15e24397ab..d5b29ecf9ea5396fc2c57420982a76b0fc8b5018 100644 (file)
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -1,63 +1,15 @@
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.

  *
  *

- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html

  */
 
 #include <stdio.h>
 #include <errno.h>
  */
 
 #include <stdio.h>
 #include <errno.h>

-#include "bio_lcl.h"
+#include "bio_local.h"

 
 #ifndef OPENSSL_NO_SOCK
 
 
 #ifndef OPENSSL_NO_SOCK
 


@@ -102,19 +54,23 @@ static void BIO_ACCEPT_free(BIO_ACCEPT *a);
 static const BIO_METHOD methods_acceptp = {
     BIO_TYPE_ACCEPT,
     "socket accept",
 static const BIO_METHOD methods_acceptp = {
     BIO_TYPE_ACCEPT,
     "socket accept",

+    /* TODO: Convert to new style write function */
+    bwrite_conv,

     acpt_write,
     acpt_write,

+    /* TODO: Convert to new style read function */
+    bread_conv,

     acpt_read,
     acpt_puts,
     acpt_read,
     acpt_puts,

-    NULL,                       /* connect_gets, */
+    NULL,                       /* connect_gets,         */

     acpt_ctrl,
     acpt_new,
     acpt_free,
     acpt_ctrl,
     acpt_new,
     acpt_free,

-    NULL,
+    NULL,                       /* connect_callback_ctrl */

 };
 
 const BIO_METHOD *BIO_s_accept(void)
 {
 };
 
 const BIO_METHOD *BIO_s_accept(void)
 {

-    return (&methods_acceptp);
+    return &methods_acceptp;

 }
 
 static int acpt_new(BIO *bi)
 }
 
 static int acpt_new(BIO *bi)


@@ -125,29 +81,30 @@ static int acpt_new(BIO *bi)
     bi->num = (int)INVALID_SOCKET;
     bi->flags = 0;
     if ((ba = BIO_ACCEPT_new()) == NULL)
     bi->num = (int)INVALID_SOCKET;
     bi->flags = 0;
     if ((ba = BIO_ACCEPT_new()) == NULL)

-        return (0);
+        return 0;

     bi->ptr = (char *)ba;
     ba->state = ACPT_S_BEFORE;
     bi->shutdown = 1;
     bi->ptr = (char *)ba;
     ba->state = ACPT_S_BEFORE;
     bi->shutdown = 1;

-    return (1);
+    return 1;

 }
 
 static BIO_ACCEPT *BIO_ACCEPT_new(void)
 {
     BIO_ACCEPT *ret;
 
 }
 
 static BIO_ACCEPT *BIO_ACCEPT_new(void)
 {
     BIO_ACCEPT *ret;
 

-    if ((ret = OPENSSL_zalloc(sizeof(*ret))) == NULL)
-        return (NULL);
+    if ((ret = OPENSSL_zalloc(sizeof(*ret))) == NULL) {
+        BIOerr(BIO_F_BIO_ACCEPT_NEW, ERR_R_MALLOC_FAILURE);
+        return NULL;
+    }

     ret->accept_family = BIO_FAMILY_IPANY;
     ret->accept_sock = (int)INVALID_SOCKET;
     ret->accept_family = BIO_FAMILY_IPANY;
     ret->accept_sock = (int)INVALID_SOCKET;

-    return (ret);
+    return ret;

 }
 
 static void BIO_ACCEPT_free(BIO_ACCEPT *a)
 {
     if (a == NULL)
         return;
 }
 
 static void BIO_ACCEPT_free(BIO_ACCEPT *a)
 {
     if (a == NULL)
         return;

-

     OPENSSL_free(a->param_addr);
     OPENSSL_free(a->param_serv);
     BIO_ADDRINFO_free(a->addr_first);
     OPENSSL_free(a->param_addr);
     OPENSSL_free(a->param_serv);
     BIO_ADDRINFO_free(a->addr_first);


@@ -177,7 +134,7 @@ static int acpt_free(BIO *a)
     BIO_ACCEPT *data;
 
     if (a == NULL)
     BIO_ACCEPT *data;
 
     if (a == NULL)

-        return (0);
+        return 0;

     data = (BIO_ACCEPT *)a->ptr;
 
     if (a->shutdown) {
     data = (BIO_ACCEPT *)a->ptr;
 
     if (a->shutdown) {


@@ -187,7 +144,7 @@ static int acpt_free(BIO *a)
         a->flags = 0;
         a->init = 0;
     }
         a->flags = 0;
         a->init = 0;
     }

-    return (1);
+    return 1;

 }
 
 static int acpt_state(BIO *b, BIO_ACCEPT *c)
 }
 
 static int acpt_state(BIO *b, BIO_ACCEPT *c)


@@ -265,20 +222,20 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
             break;
 
         case ACPT_S_CREATE_SOCKET:
             break;
 
         case ACPT_S_CREATE_SOCKET:

-            ret = BIO_socket(BIO_ADDRINFO_family(c->addr_iter),
-                             BIO_ADDRINFO_socktype(c->addr_iter),
-                             BIO_ADDRINFO_protocol(c->addr_iter), 0);
-            if (ret == (int)INVALID_SOCKET) {
-                SYSerr(SYS_F_SOCKET, get_last_socket_error());
-                ERR_add_error_data(4,
-                                   "hostname=", c->param_addr,
-                                   " service=", c->param_serv);
+            s = BIO_socket(BIO_ADDRINFO_family(c->addr_iter),
+                           BIO_ADDRINFO_socktype(c->addr_iter),
+                           BIO_ADDRINFO_protocol(c->addr_iter), 0);
+            if (s == (int)INVALID_SOCKET) {
+                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                               "calling socket(%s, %s)",
+                                c->param_addr, c->param_serv);

                 BIOerr(BIO_F_ACPT_STATE, BIO_R_UNABLE_TO_CREATE_SOCKET);
                 goto exit_loop;
             }
                 BIOerr(BIO_F_ACPT_STATE, BIO_R_UNABLE_TO_CREATE_SOCKET);
                 goto exit_loop;
             }

-            c->accept_sock = ret;
-            b->num = ret;
+            c->accept_sock = s;
+            b->num = s;

             c->state = ACPT_S_LISTEN;
             c->state = ACPT_S_LISTEN;

+            s = -1;

             break;
 
         case ACPT_S_LISTEN:
             break;
 
         case ACPT_S_LISTEN:


@@ -319,6 +276,11 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
             BIO_clear_retry_flags(b);
             b->retry_reason = 0;
 
             BIO_clear_retry_flags(b);
             b->retry_reason = 0;
 

+            OPENSSL_free(c->cache_peer_name);
+            c->cache_peer_name = NULL;
+            OPENSSL_free(c->cache_peer_serv);
+            c->cache_peer_serv = NULL;
+

             s = BIO_accept_ex(c->accept_sock, &c->cache_peer_addr,
                               c->accepted_mode);
 
             s = BIO_accept_ex(c->accept_sock, &c->cache_peer_addr,
                               c->accepted_mode);
 


@@ -403,12 +365,12 @@ static int acpt_read(BIO *b, char *out, int outl)
     while (b->next_bio == NULL) {
         ret = acpt_state(b, data);
         if (ret <= 0)
     while (b->next_bio == NULL) {
         ret = acpt_state(b, data);
         if (ret <= 0)

-            return (ret);
+            return ret;

     }
 
     ret = BIO_read(b->next_bio, out, outl);
     BIO_copy_next_retry(b);
     }
 
     ret = BIO_read(b->next_bio, out, outl);
     BIO_copy_next_retry(b);

-    return (ret);
+    return ret;

 }
 
 static int acpt_write(BIO *b, const char *in, int inl)
 }
 
 static int acpt_write(BIO *b, const char *in, int inl)


@@ -422,12 +384,12 @@ static int acpt_write(BIO *b, const char *in, int inl)
     while (b->next_bio == NULL) {
         ret = acpt_state(b, data);
         if (ret <= 0)
     while (b->next_bio == NULL) {
         ret = acpt_state(b, data);
         if (ret <= 0)

-            return (ret);
+            return ret;

     }
 
     ret = BIO_write(b->next_bio, in, inl);
     BIO_copy_next_retry(b);
     }
 
     ret = BIO_write(b->next_bio, in, inl);
     BIO_copy_next_retry(b);

-    return (ret);
+    return ret;

 }
 
 static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
 }
 
 static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)


@@ -471,19 +433,20 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
                 b->init = 1;
             } else if (num == 1) {
                 OPENSSL_free(data->param_serv);
                 b->init = 1;
             } else if (num == 1) {
                 OPENSSL_free(data->param_serv);

-                data->param_serv = BUF_strdup(ptr);
+                data->param_serv = OPENSSL_strdup(ptr);

                 b->init = 1;
             } else if (num == 2) {
                 b->init = 1;
             } else if (num == 2) {

-                if (ptr != NULL)
-                    data->bind_mode |= BIO_SOCK_NONBLOCK;
-                else
-                    data->bind_mode &= ~BIO_SOCK_NONBLOCK;
+                data->bind_mode |= BIO_SOCK_NONBLOCK;

             } else if (num == 3) {
                 BIO_free(data->bio_chain);
                 data->bio_chain = (BIO *)ptr;
             } else if (num == 4) {
                 data->accept_family = *(int *)ptr;
             }
             } else if (num == 3) {
                 BIO_free(data->bio_chain);
                 data->bio_chain = (BIO *)ptr;
             } else if (num == 4) {
                 data->accept_family = *(int *)ptr;
             }

+        } else {
+            if (num == 2) {
+                data->bind_mode &= ~BIO_SOCK_NONBLOCK;
+            }

         }
         break;
     case BIO_C_SET_NBIO:
         }
         break;
     case BIO_C_SET_NBIO:


@@ -493,7 +456,6 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
             data->accepted_mode &= ~BIO_SOCK_NONBLOCK;
         break;
     case BIO_C_SET_FD:
             data->accepted_mode &= ~BIO_SOCK_NONBLOCK;
         break;
     case BIO_C_SET_FD:

-        b->init = 1;

         b->num = *((int *)ptr);
         data->accept_sock = b->num;
         data->state = ACPT_S_ACCEPT;
         b->num = *((int *)ptr);
         data->accept_sock = b->num;
         data->state = ACPT_S_ACCEPT;


@@ -564,19 +526,18 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
         ret = (long)data->bind_mode;
         break;
     case BIO_CTRL_DUP:
         ret = (long)data->bind_mode;
         break;
     case BIO_CTRL_DUP:

-/*-     dbio=(BIO *)ptr;
-        if (data->param_port) EAY EAY
-                BIO_set_port(dbio,data->param_port);
-        if (data->param_hostname)
-                BIO_set_hostname(dbio,data->param_hostname);
-        BIO_set_nbio(dbio,data->nbio); */

         break;
         break;

-
+    case BIO_CTRL_EOF:
+        if (b->next_bio == NULL)
+            ret = 0;
+        else
+            ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
+        break;

     default:
         ret = 0;
         break;
     }
     default:
         ret = 0;
         break;
     }

-    return (ret);
+    return ret;

 }
 
 static int acpt_puts(BIO *bp, const char *str)
 }
 
 static int acpt_puts(BIO *bp, const char *str)


@@ -585,7 +546,7 @@ static int acpt_puts(BIO *bp, const char *str)
 
     n = strlen(str);
     ret = acpt_write(bp, str, n);
 
     n = strlen(str);
     ret = acpt_write(bp, str, n);

-    return (ret);
+    return ret;

 }
 
 BIO *BIO_new_accept(const char *str)
 }
 
 BIO *BIO_new_accept(const char *str)


@@ -594,11 +555,11 @@ BIO *BIO_new_accept(const char *str)
 
     ret = BIO_new(BIO_s_accept());
     if (ret == NULL)
 
     ret = BIO_new(BIO_s_accept());
     if (ret == NULL)

-        return (NULL);
-    if (BIO_set_accept_port(ret, str))
-        return (ret);
+        return NULL;
+    if (BIO_set_accept_name(ret, str))
+        return ret;

     BIO_free(ret);
     BIO_free(ret);

-    return (NULL);
+    return NULL;

 }
 
 #endif
 }
 
 #endif