summaryrefslogtreecommitdiff
path: root/libcrypto
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-10-21 16:58:03 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-10-21 16:58:03 +0300
commitbd73937e5c2e18b7516dfaf3986e9c8dccf65f65 (patch)
treea5b4ce18c891731920f66c69253d7775221a5866 /libcrypto
parent2e7506efa1f1015e9fd965b85c934cf3bc3014f9 (diff)
Release version 1.1.1+15v1.1.1+15
Upgrade to 1.1.1l Add support for arm64 architecture for MacOS Cleanup comments in headers
Diffstat (limited to 'libcrypto')
-rw-r--r--libcrypto/build/bootstrap.build2
-rw-r--r--libcrypto/libcrypto/downstream/crypto/bn_conf.h3
-rw-r--r--libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-macos.h28
-rw-r--r--libcrypto/libcrypto/downstream/crypto/buildinf.h3
-rw-r--r--libcrypto/libcrypto/downstream/crypto/dso_conf.h3
-rw-r--r--libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-macos.h17
-rw-r--r--libcrypto/libcrypto/downstream/crypto/platform.h18
-rw-r--r--libcrypto/libcrypto/downstream/openssl/opensslconf.h9
-rw-r--r--libcrypto/libcrypto/downstream/openssl/opensslconf/arm64-macos.h194
-rw-r--r--libcrypto/manifest4
10 files changed, 264 insertions, 17 deletions
diff --git a/libcrypto/build/bootstrap.build b/libcrypto/build/bootstrap.build
index 8fca9f0..53c39e2 100644
--- a/libcrypto/build/bootstrap.build
+++ b/libcrypto/build/bootstrap.build
@@ -1,4 +1,4 @@
-# file : build/root.build
+# file : build/bootstrap.build
# license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
project = libcrypto
diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf.h b/libcrypto/libcrypto/downstream/crypto/bn_conf.h
index e56ebf1..243a451 100644
--- a/libcrypto/libcrypto/downstream/crypto/bn_conf.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf.h
@@ -5,8 +5,7 @@
#ifndef LIBCRYPTO_DOWNSTREAM_CRYPTO_BN_CONF_H
#define LIBCRYPTO_DOWNSTREAM_CRYPTO_BN_CONF_H
-/*
- * Include upstream's auto-generated platform-specific bn_conf.h.
+/* Include upstream's auto-generated platform-specific bn_conf.h.
*/
#include <crypto/bn_conf/platform.h>
diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-macos.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-macos.h
new file mode 100644
index 0000000..0bacac0
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-macos.h
@@ -0,0 +1,28 @@
+/* WARNING: do not edit! */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * 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 OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
+
+/*
+ * The contents of this file are not used in the UEFI build, as
+ * both 32-bit and 64-bit builds are supported from a single run
+ * of the Configure script.
+ */
+
+/* Should we define BN_DIV2W here? */
+
+/* Only one for the following should be defined */
+#define SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#undef THIRTY_TWO_BIT
+
+#endif
diff --git a/libcrypto/libcrypto/downstream/crypto/buildinf.h b/libcrypto/libcrypto/downstream/crypto/buildinf.h
index 938b93f..ea7d178 100644
--- a/libcrypto/libcrypto/downstream/crypto/buildinf.h
+++ b/libcrypto/libcrypto/downstream/crypto/buildinf.h
@@ -2,8 +2,7 @@
* license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
*/
-/*
- * Replace upstream's auto-generated buildinf.h with our own auto-generated
+/* Replace upstream's auto-generated buildinf.h with our own auto-generated
* version of it. Note that upstream source files include it as follows:
*
* #include "buildinf.h"
diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf.h b/libcrypto/libcrypto/downstream/crypto/dso_conf.h
index 1802916..5f01c81 100644
--- a/libcrypto/libcrypto/downstream/crypto/dso_conf.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf.h
@@ -5,8 +5,7 @@
#ifndef LIBCRYPTO_DOWNSTREAM_CRYPTO_DSO_CONF_H
#define LIBCRYPTO_DOWNSTREAM_CRYPTO_DSO_CONF_H
-/*
- * Include upstream's auto-generated platform-specific dso_conf.h.
+/* Include upstream's auto-generated platform-specific dso_conf.h.
*/
#include <crypto/dso_conf/platform.h>
diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-macos.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-macos.h
new file mode 100644
index 0000000..d2e22e2
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-macos.h
@@ -0,0 +1,17 @@
+/* WARNING: do not edit! */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
+/*
+ * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * 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 OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
+# define DSO_DLFCN
+# define HAVE_DLFCN_H
+# define DSO_EXTENSION ".dylib"
+#endif
diff --git a/libcrypto/libcrypto/downstream/crypto/platform.h b/libcrypto/libcrypto/downstream/crypto/platform.h
index 1ec5c81..c5f0984 100644
--- a/libcrypto/libcrypto/downstream/crypto/platform.h
+++ b/libcrypto/libcrypto/downstream/crypto/platform.h
@@ -2,8 +2,7 @@
* license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
*/
-/*
- * This header is used for inclusion of upstream's auto-generated
+/* This header is used for inclusion of upstream's auto-generated
* platform-specific header.
*
* If there is the auto-generated header foo.h, then the workflow is normally
@@ -33,6 +32,21 @@
# else
# error x86_64 architecture is not supported for this OS
# endif
+# elif defined(__arm64__) /* POSIX arm64 */
+# if defined(__APPLE__)
+# include "arm64-macos.h"
+/*
+ * arm64 architecture is not currently supported for Linux and FreeBSD.
+ */
+/*
+# elif defined(__linux__)
+# include "arm64-linux.h"
+# elif defined(__FreeBSD__)
+# include "arm64-freebsd.h"
+*/
+# else
+# error arm64 architecture is not supported for this OS
+# endif
# elif defined(__i386__) /* POSIX i386 */
# if defined(__linux__)
# include "i686-linux.h"
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf.h b/libcrypto/libcrypto/downstream/openssl/opensslconf.h
index e9eb1cb..ffb128e 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf.h
@@ -5,16 +5,14 @@
#ifndef LIBCRYPTO_DOWNSTREAM_OPENSSL_OPENSSLCONF_H
#define LIBCRYPTO_DOWNSTREAM_OPENSSL_OPENSSLCONF_H
-/*
- * Define OPENSSL_PIC and {L|B}_ENDIAN macros (that upstream defines on the
+/* Define OPENSSL_PIC and {L|B}_ENDIAN macros (that upstream defines on the
* command line via -D) if we are building libcrypto (see ../../buildfile for
* details).
*/
#ifdef LIBCRYPTO_BUILD
# define OPENSSL_PIC
-/*
- * Endianess.
+/* Endianess.
*/
# ifdef __FreeBSD__
# include <sys/endian.h> /* BYTE_ORDER */
@@ -46,8 +44,7 @@
# endif
#endif
-/*
- * Include upstream's auto-generated platform-specific opensslconf.h.
+/* Include upstream's auto-generated platform-specific opensslconf.h.
*/
#include <openssl/opensslconf/platform.h>
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/arm64-macos.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/arm64-macos.h
new file mode 100644
index 0000000..05f8464
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/arm64-macos.h
@@ -0,0 +1,194 @@
+/*
+ * WARNING: do not edit!
+ * Generated by Makefile from ../include/openssl/opensslconf.h.in
+ *
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * 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
+ */
+
+#include <openssl/opensslv.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef OPENSSL_ALGORITHM_DEFINES
+# error OPENSSL_ALGORITHM_DEFINES no longer supported
+#endif
+
+/*
+ * OpenSSL was configured with the following options:
+ */
+
+#ifndef OPENSSL_SYS_MACOSX
+# define OPENSSL_SYS_MACOSX 1
+#endif
+#ifndef OPENSSL_NO_MDC2
+# define OPENSSL_NO_MDC2
+#endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
+#ifndef OPENSSL_RAND_SEED_OS
+# define OPENSSL_RAND_SEED_OS
+#endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
+#ifndef OPENSSL_NO_ASAN
+# define OPENSSL_NO_ASAN
+#endif
+#ifndef OPENSSL_NO_ASM
+# define OPENSSL_NO_ASM
+#endif
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
+# define OPENSSL_NO_CRYPTO_MDEBUG
+#endif
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+#endif
+#ifndef OPENSSL_NO_DEVCRYPTOENG
+# define OPENSSL_NO_DEVCRYPTOENG
+#endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
+#ifndef OPENSSL_NO_EGD
+# define OPENSSL_NO_EGD
+#endif
+#ifndef OPENSSL_NO_EXTERNAL_TESTS
+# define OPENSSL_NO_EXTERNAL_TESTS
+#endif
+#ifndef OPENSSL_NO_FUZZ_AFL
+# define OPENSSL_NO_FUZZ_AFL
+#endif
+#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
+# define OPENSSL_NO_FUZZ_LIBFUZZER
+#endif
+#ifndef OPENSSL_NO_HEARTBEATS
+# define OPENSSL_NO_HEARTBEATS
+#endif
+#ifndef OPENSSL_NO_MSAN
+# define OPENSSL_NO_MSAN
+#endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_UBSAN
+# define OPENSSL_NO_UBSAN
+#endif
+#ifndef OPENSSL_NO_UNIT_TEST
+# define OPENSSL_NO_UNIT_TEST
+#endif
+#ifndef OPENSSL_NO_STATIC_ENGINE
+# define OPENSSL_NO_STATIC_ENGINE
+#endif
+
+
+/*
+ * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
+ * don't like that. This will hopefully silence them.
+ */
+#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
+
+/*
+ * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
+ * declarations of functions deprecated in or before <version>. Otherwise, they
+ * still won't see them if the library has been built to disable deprecated
+ * functions.
+ */
+#ifndef DECLARE_DEPRECATED
+# define DECLARE_DEPRECATED(f) f;
+# ifdef __GNUC__
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+# undef DECLARE_DEPRECATED
+# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
+# endif
+# elif defined(__SUNPRO_C)
+# if (__SUNPRO_C >= 0x5130)
+# undef DECLARE_DEPRECATED
+# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
+# endif
+# endif
+#endif
+
+#ifndef OPENSSL_FILE
+# ifdef OPENSSL_NO_FILENAMES
+# define OPENSSL_FILE ""
+# define OPENSSL_LINE 0
+# else
+# define OPENSSL_FILE __FILE__
+# define OPENSSL_LINE __LINE__
+# endif
+#endif
+
+#ifndef OPENSSL_MIN_API
+# define OPENSSL_MIN_API 0
+#endif
+
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
+# undef OPENSSL_API_COMPAT
+# define OPENSSL_API_COMPAT OPENSSL_MIN_API
+#endif
+
+/*
+ * Do not deprecate things to be deprecated in version 1.2.0 before the
+ * OpenSSL version number matches.
+ */
+#if OPENSSL_VERSION_NUMBER < 0x10200000L
+# define DEPRECATEDIN_1_2_0(f) f;
+#elif OPENSSL_API_COMPAT < 0x10200000L
+# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_2_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_1_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10000000L
+# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_0_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x00908000L
+# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_0_9_8(f)
+#endif
+
+/* Generate 80386 code? */
+#undef I386_ONLY
+
+#undef OPENSSL_UNISTD
+#define OPENSSL_UNISTD <unistd.h>
+
+#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
+
+/*
+ * The following are cipher-specific, but are part of the public API.
+ */
+#if !defined(OPENSSL_SYS_UEFI)
+# undef BN_LLONG
+/* Only one for the following should be defined */
+# define SIXTY_FOUR_BIT_LONG
+# undef SIXTY_FOUR_BIT
+# undef THIRTY_TWO_BIT
+#endif
+
+#define RC4_INT unsigned int
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/libcrypto/manifest b/libcrypto/manifest
index 5b333eb..f8b4614 100644
--- a/libcrypto/manifest
+++ b/libcrypto/manifest
@@ -3,8 +3,8 @@ name: libcrypto
# Note: remember to update doc-url below!
#
-version: 1.1.1+14
-upstream-version: 1.1.1k
+version: 1.1.1+15
+upstream-version: 1.1.1l
project: openssl
priority: security