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

6 files changed, 64 insertions, 8 deletions

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"