Fix up path generation to use OPENSSL_MODULES

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

diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index cefd35f9841c5f059d4dda0db54cd10ca2b243a4..01138729b002e99cfa8476bf32e97db7e9881354 100644 (file)
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -1,63 +1,15 @@
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * 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.
+/*
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.

  *
  *

- * 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"

 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 


@@ -72,7 +24,7 @@ static int nbiof_gets(BIO *h, char *str, int size);
 static long nbiof_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int nbiof_new(BIO *h);
 static int nbiof_free(BIO *data);
 static long nbiof_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int nbiof_new(BIO *h);
 static int nbiof_free(BIO *data);

-static long nbiof_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
+static long nbiof_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);

 typedef struct nbio_test_st {
     /* only set if we sent a 'should retry' error */
     int lrn;
 typedef struct nbio_test_st {
     /* only set if we sent a 'should retry' error */
     int lrn;


@@ -82,7 +34,9 @@ typedef struct nbio_test_st {
 static const BIO_METHOD methods_nbiof = {
     BIO_TYPE_NBIO_TEST,
     "non-blocking IO test filter",
 static const BIO_METHOD methods_nbiof = {
     BIO_TYPE_NBIO_TEST,
     "non-blocking IO test filter",

+    bwrite_conv,

     nbiof_write,
     nbiof_write,

+    bread_conv,

     nbiof_read,
     nbiof_puts,
     nbiof_gets,
     nbiof_read,
     nbiof_puts,
     nbiof_gets,


@@ -94,7 +48,7 @@ static const BIO_METHOD methods_nbiof = {
 
 const BIO_METHOD *BIO_f_nbio_test(void)
 {
 
 const BIO_METHOD *BIO_f_nbio_test(void)
 {

-    return (&methods_nbiof);
+    return &methods_nbiof;

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


@@ -102,23 +56,23 @@ static int nbiof_new(BIO *bi)
     NBIO_TEST *nt;
 
     if ((nt = OPENSSL_zalloc(sizeof(*nt))) == NULL)
     NBIO_TEST *nt;
 
     if ((nt = OPENSSL_zalloc(sizeof(*nt))) == NULL)

-        return (0);
+        return 0;

     nt->lrn = -1;
     nt->lwn = -1;
     bi->ptr = (char *)nt;
     bi->init = 1;
     nt->lrn = -1;
     nt->lwn = -1;
     bi->ptr = (char *)nt;
     bi->init = 1;

-    return (1);
+    return 1;

 }
 
 static int nbiof_free(BIO *a)
 {
     if (a == NULL)
 }
 
 static int nbiof_free(BIO *a)
 {
     if (a == NULL)

-        return (0);
+        return 0;

     OPENSSL_free(a->ptr);
     a->ptr = NULL;
     a->init = 0;
     a->flags = 0;
     OPENSSL_free(a->ptr);
     a->ptr = NULL;
     a->init = 0;
     a->flags = 0;

-    return (1);
+    return 1;

 }
 
 static int nbiof_read(BIO *b, char *out, int outl)
 }
 
 static int nbiof_read(BIO *b, char *out, int outl)


@@ -128,12 +82,12 @@ static int nbiof_read(BIO *b, char *out, int outl)
     unsigned char n;
 
     if (out == NULL)
     unsigned char n;
 
     if (out == NULL)

-        return (0);
+        return 0;

     if (b->next_bio == NULL)
     if (b->next_bio == NULL)

-        return (0);
+        return 0;

 
     BIO_clear_retry_flags(b);
 
     BIO_clear_retry_flags(b);

-    if (RAND_bytes(&n, 1) <= 0)
+    if (RAND_priv_bytes(&n, 1) <= 0)

         return -1;
     num = (n & 0x07);
 
         return -1;
     num = (n & 0x07);
 


@@ -148,7 +102,7 @@ static int nbiof_read(BIO *b, char *out, int outl)
         if (ret < 0)
             BIO_copy_next_retry(b);
     }
         if (ret < 0)
             BIO_copy_next_retry(b);
     }

-    return (ret);
+    return ret;

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


@@ -159,9 +113,9 @@ static int nbiof_write(BIO *b, const char *in, int inl)
     unsigned char n;
 
     if ((in == NULL) || (inl <= 0))
     unsigned char n;
 
     if ((in == NULL) || (inl <= 0))

-        return (0);
+        return 0;

     if (b->next_bio == NULL)
     if (b->next_bio == NULL)

-        return (0);
+        return 0;

     nt = (NBIO_TEST *)b->ptr;
 
     BIO_clear_retry_flags(b);
     nt = (NBIO_TEST *)b->ptr;
 
     BIO_clear_retry_flags(b);


@@ -170,7 +124,7 @@ static int nbiof_write(BIO *b, const char *in, int inl)
         num = nt->lwn;
         nt->lwn = 0;
     } else {
         num = nt->lwn;
         nt->lwn = 0;
     } else {

-        if (RAND_bytes(&n, 1) <= 0)
+        if (RAND_priv_bytes(&n, 1) <= 0)

             return -1;
         num = (n & 7);
     }
             return -1;
         num = (n & 7);
     }


@@ -188,7 +142,7 @@ static int nbiof_write(BIO *b, const char *in, int inl)
             nt->lwn = inl;
         }
     }
             nt->lwn = inl;
         }
     }

-    return (ret);
+    return ret;

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


@@ -196,7 +150,7 @@ static long nbiof_ctrl(BIO *b, int cmd, long num, void *ptr)
     long ret;
 
     if (b->next_bio == NULL)
     long ret;
 
     if (b->next_bio == NULL)

-        return (0);
+        return 0;

     switch (cmd) {
     case BIO_C_DO_STATE_MACHINE:
         BIO_clear_retry_flags(b);
     switch (cmd) {
     case BIO_C_DO_STATE_MACHINE:
         BIO_clear_retry_flags(b);


@@ -210,33 +164,26 @@ static long nbiof_ctrl(BIO *b, int cmd, long num, void *ptr)
         ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
         break;
     }
         ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
         break;
     }

-    return (ret);
+    return ret;

 }
 
 }
 

-static long nbiof_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
+static long nbiof_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)

 {
 {

-    long ret = 1;
-

     if (b->next_bio == NULL)
     if (b->next_bio == NULL)

-        return (0);
-    switch (cmd) {
-    default:
-        ret = BIO_callback_ctrl(b->next_bio, cmd, fp);
-        break;
-    }
-    return (ret);
+        return 0;
+    return BIO_callback_ctrl(b->next_bio, cmd, fp);

 }
 
 static int nbiof_gets(BIO *bp, char *buf, int size)
 {
     if (bp->next_bio == NULL)
 }
 
 static int nbiof_gets(BIO *bp, char *buf, int size)
 {
     if (bp->next_bio == NULL)

-        return (0);
-    return (BIO_gets(bp->next_bio, buf, size));
+        return 0;
+    return BIO_gets(bp->next_bio, buf, size);

 }
 
 static int nbiof_puts(BIO *bp, const char *str)
 {
     if (bp->next_bio == NULL)
 }
 
 static int nbiof_puts(BIO *bp, const char *str)
 {
     if (bp->next_bio == NULL)

-        return (0);
-    return (BIO_puts(bp->next_bio, str));
+        return 0;
+    return BIO_puts(bp->next_bio, str);

 }
 }