OpenSSL upgraded to 1.1.1

1 files changed, 30 insertions, 97 deletions

diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h
index eab0d1ebc0..dd23b2e0fe 100644
--- a/include/openssl/buffer.h
+++ b/include/openssl/buffer.h
@@ -1,125 +1,58 @@
-/* crypto/buffer/buffer.h */

-/* 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-2018 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 OpenSSL license (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

  */

 

 #ifndef HEADER_BUFFER_H

 # define HEADER_BUFFER_H

 

 # include <openssl/ossl_typ.h>

+# ifndef HEADER_CRYPTO_H

+#  include <openssl/crypto.h>

+# endif

+# include <openssl/buffererr.h>

+

 

 #ifdef  __cplusplus

 extern "C" {

 #endif

 

 # include <stddef.h>

+# include <sys/types.h>

 

-# if !defined(NO_SYS_TYPES_H)

-#  include <sys/types.h>

-# endif

-

-/* Already declared in ossl_typ.h */

-/* typedef struct buf_mem_st BUF_MEM; */

+/*

+ * These names are outdated as of OpenSSL 1.1; a future release

+ * will move them to be deprecated.

+ */

+# define BUF_strdup(s) OPENSSL_strdup(s)

+# define BUF_strndup(s, size) OPENSSL_strndup(s, size)

+# define BUF_memdup(data, size) OPENSSL_memdup(data, size)

+# define BUF_strlcpy(dst, src, size)  OPENSSL_strlcpy(dst, src, size)

+# define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)

+# define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)

 

 struct buf_mem_st {

     size_t length;              /* current number of bytes */

     char *data;

     size_t max;                 /* size of buffer */

+    unsigned long flags;

 };

 

+# define BUF_MEM_FLAG_SECURE  0x01

+

 BUF_MEM *BUF_MEM_new(void);

+BUF_MEM *BUF_MEM_new_ex(unsigned long flags);

 void BUF_MEM_free(BUF_MEM *a);

-int BUF_MEM_grow(BUF_MEM *str, size_t len);

-int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);

-size_t BUF_strnlen(const char *str, size_t maxlen);

-char *BUF_strdup(const char *str);

-

-/*

- * Like strndup, but in addition, explicitly guarantees to never read past the

- * first |siz| bytes of |str|.

- */

-char *BUF_strndup(const char *str, size_t siz);

-

-void *BUF_memdup(const void *data, size_t siz);

+size_t BUF_MEM_grow(BUF_MEM *str, size_t len);

+size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len);

 void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);

 

-/* safe string functions */

-size_t BUF_strlcpy(char *dst, const char *src, size_t siz);

-size_t BUF_strlcat(char *dst, const char *src, size_t siz);

-

-/* BEGIN ERROR CODES */

-/*

- * The following lines are auto generated by the script mkerr.pl. Any changes

- * made after this point may be overwritten when the script is next run.

- */

-void ERR_load_BUF_strings(void);

 

-/* Error codes for the BUF functions. */

-

-/* Function codes. */

-# define BUF_F_BUF_MEMDUP                                 103

-# define BUF_F_BUF_MEM_GROW                               100

-# define BUF_F_BUF_MEM_GROW_CLEAN                         105

-# define BUF_F_BUF_MEM_NEW                                101

-# define BUF_F_BUF_STRDUP                                 102

-# define BUF_F_BUF_STRNDUP                                104

-

-/* Reason codes. */

-

-#ifdef  __cplusplus

+# ifdef  __cplusplus

 }

-#endif

+# endif

 #endif