From bcb070e59279c6ce4ab9fbc8c6f7350a513144c2 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 30 Apr 2020 22:21:59 +0300 Subject: Release version 1.1.1+11 Upgrade to 1.1.1g --- libcrypto/libcrypto/downstream/crypto/bn_conf.h | 13 ++++ .../libcrypto/downstream/crypto/bn_conf.h.in.orig | 1 + .../downstream/crypto/bn_conf/i686-linux.h | 28 +++++++++ .../downstream/crypto/bn_conf/i686-win32-mingw32.h | 28 +++++++++ .../downstream/crypto/bn_conf/i686-win32-msvc.h | 28 +++++++++ .../libcrypto/downstream/crypto/bn_conf/platform.h | 1 + .../downstream/crypto/bn_conf/x86_64-freebsd.h | 28 +++++++++ .../downstream/crypto/bn_conf/x86_64-linux.h | 28 +++++++++ .../downstream/crypto/bn_conf/x86_64-macos.h | 28 +++++++++ .../crypto/bn_conf/x86_64-win32-mingw32.h | 28 +++++++++ .../downstream/crypto/bn_conf/x86_64-win32-msvc.h | 28 +++++++++ libcrypto/libcrypto/downstream/crypto/buildinf.h | 14 +++++ libcrypto/libcrypto/downstream/crypto/dso_conf.h | 13 ++++ .../libcrypto/downstream/crypto/dso_conf.h.in.orig | 1 + .../downstream/crypto/dso_conf/i686-linux.h | 17 +++++ .../crypto/dso_conf/i686-win32-mingw32.h | 16 +++++ .../downstream/crypto/dso_conf/i686-win32-msvc.h | 16 +++++ .../downstream/crypto/dso_conf/platform.h | 1 + .../downstream/crypto/dso_conf/x86_64-freebsd.h | 17 +++++ .../downstream/crypto/dso_conf/x86_64-linux.h | 17 +++++ .../downstream/crypto/dso_conf/x86_64-macos.h | 17 +++++ .../crypto/dso_conf/x86_64-win32-mingw32.h | 16 +++++ .../downstream/crypto/dso_conf/x86_64-win32-msvc.h | 16 +++++ libcrypto/libcrypto/downstream/crypto/platform.h | 72 ++++++++++++++++++++++ libcrypto/libcrypto/downstream/internal/bn_conf.h | 13 ---- .../downstream/internal/bn_conf.h.in.orig | 1 - .../downstream/internal/bn_conf/i686-linux.h | 28 --------- .../internal/bn_conf/i686-win32-mingw32.h | 28 --------- .../downstream/internal/bn_conf/i686-win32-msvc.h | 28 --------- .../downstream/internal/bn_conf/platform.h | 1 - .../downstream/internal/bn_conf/x86_64-freebsd.h | 28 --------- .../downstream/internal/bn_conf/x86_64-linux.h | 28 --------- .../downstream/internal/bn_conf/x86_64-macos.h | 28 --------- .../internal/bn_conf/x86_64-win32-mingw32.h | 28 --------- .../internal/bn_conf/x86_64-win32-msvc.h | 28 --------- libcrypto/libcrypto/downstream/internal/buildinf.h | 14 ----- libcrypto/libcrypto/downstream/internal/dso_conf.h | 13 ---- .../downstream/internal/dso_conf.h.in.orig | 1 - .../downstream/internal/dso_conf/i686-linux.h | 17 ----- .../internal/dso_conf/i686-win32-mingw32.h | 16 ----- .../downstream/internal/dso_conf/i686-win32-msvc.h | 16 ----- .../downstream/internal/dso_conf/platform.h | 1 - .../downstream/internal/dso_conf/x86_64-freebsd.h | 17 ----- .../downstream/internal/dso_conf/x86_64-linux.h | 17 ----- .../downstream/internal/dso_conf/x86_64-macos.h | 17 ----- .../internal/dso_conf/x86_64-win32-mingw32.h | 16 ----- .../internal/dso_conf/x86_64-win32-msvc.h | 16 ----- libcrypto/libcrypto/downstream/internal/platform.h | 72 ---------------------- .../downstream/openssl/opensslconf.h.in.orig | 2 +- .../openssl/opensslconf/i686-win32-mingw32.h | 6 +- .../openssl/opensslconf/i686-win32-msvc.h | 6 +- .../downstream/openssl/opensslconf/platform.h | 2 +- .../openssl/opensslconf/x86_64-freebsd.h | 6 +- .../downstream/openssl/opensslconf/x86_64-macos.h | 6 +- .../openssl/opensslconf/x86_64-win32-mingw32.h | 6 +- .../openssl/opensslconf/x86_64-win32-msvc.h | 6 +- 56 files changed, 492 insertions(+), 492 deletions(-) create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf.h create mode 120000 libcrypto/libcrypto/downstream/crypto/bn_conf.h.in.orig create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.h create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.h create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.h create mode 120000 libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.h create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-linux.h create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-macos.h create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-mingw32.h create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.h create mode 100644 libcrypto/libcrypto/downstream/crypto/buildinf.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf.h create mode 120000 libcrypto/libcrypto/downstream/crypto/dso_conf.h.in.orig create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h create mode 120000 libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-macos.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-mingw32.h create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h create mode 100644 libcrypto/libcrypto/downstream/crypto/platform.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf.h delete mode 120000 libcrypto/libcrypto/downstream/internal/bn_conf.h.in.orig delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/i686-linux.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h delete mode 120000 libcrypto/libcrypto/downstream/internal/bn_conf/platform.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-linux.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-macos.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-mingw32.h delete mode 100644 libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h delete mode 100644 libcrypto/libcrypto/downstream/internal/buildinf.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf.h delete mode 120000 libcrypto/libcrypto/downstream/internal/dso_conf.h.in.orig delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/i686-linux.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-msvc.h delete mode 120000 libcrypto/libcrypto/downstream/internal/dso_conf/platform.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h delete mode 100644 libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-msvc.h delete mode 100644 libcrypto/libcrypto/downstream/internal/platform.h (limited to 'libcrypto/libcrypto/downstream') diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf.h b/libcrypto/libcrypto/downstream/crypto/bn_conf.h new file mode 100644 index 0000000..e56ebf1 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf.h @@ -0,0 +1,13 @@ +/* file : libcrypto/downstream/crypto/bn_conf.h -*- C -*- + * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file + */ + +#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 + +#endif /* LIBCRYPTO_DOWNSTREAM_CRYPTO_BN_CONF_H */ diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf.h.in.orig b/libcrypto/libcrypto/downstream/crypto/bn_conf.h.in.orig new file mode 120000 index 0000000..8d10c99 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf.h.in.orig @@ -0,0 +1 @@ +../../../../upstream/include/crypto/bn_conf.h.in \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.h new file mode 100644 index 0000000..16d6e93 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.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 */ +#undef SIXTY_FOUR_BIT_LONG +#undef SIXTY_FOUR_BIT +#define THIRTY_TWO_BIT + +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.h new file mode 100644 index 0000000..16d6e93 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.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 */ +#undef SIXTY_FOUR_BIT_LONG +#undef SIXTY_FOUR_BIT +#define THIRTY_TWO_BIT + +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.h new file mode 100644 index 0000000..d53620f --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.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 */ +#undef SIXTY_FOUR_BIT_LONG +#undef SIXTY_FOUR_BIT +#define THIRTY_TWO_BIT + +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h new file mode 120000 index 0000000..d732646 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h @@ -0,0 +1 @@ +../platform.h \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.h new file mode 100644 index 0000000..0bacac0 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.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/bn_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-linux.h new file mode 100644 index 0000000..0bacac0 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-linux.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/bn_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-macos.h new file mode 100644 index 0000000..0bacac0 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-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/bn_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-mingw32.h new file mode 100644 index 0000000..8bcd127 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-mingw32.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 */ +#undef SIXTY_FOUR_BIT_LONG +#define SIXTY_FOUR_BIT +#undef THIRTY_TWO_BIT + +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.h new file mode 100644 index 0000000..2d8fa64 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.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 */ +#undef SIXTY_FOUR_BIT_LONG +#define SIXTY_FOUR_BIT +#undef THIRTY_TWO_BIT + +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/buildinf.h b/libcrypto/libcrypto/downstream/crypto/buildinf.h new file mode 100644 index 0000000..938b93f --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/buildinf.h @@ -0,0 +1,14 @@ +/* file : libcrypto/downstream/crypto/buildinf.h -*- C -*- + * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file + */ + +/* + * 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" + * + * We proxy the inclusion for the headers auto-generating machinery to work + * properly. + */ +#include diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf.h b/libcrypto/libcrypto/downstream/crypto/dso_conf.h new file mode 100644 index 0000000..1802916 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf.h @@ -0,0 +1,13 @@ +/* file : libcrypto/downstream/crypto/dso_conf.h -*- C -*- + * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file + */ + +#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 + +#endif /* LIBCRYPTO_DOWNSTREAM_CRYPTO_DSO_CONF_H */ diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf.h.in.orig b/libcrypto/libcrypto/downstream/crypto/dso_conf.h.in.orig new file mode 120000 index 0000000..326fe07 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf.h.in.orig @@ -0,0 +1 @@ +../../../../upstream/include/crypto/dso_conf.h.in \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.h new file mode 100644 index 0000000..2c3b479 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.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 ".so" +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h new file mode 100644 index 0000000..816754e --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h @@ -0,0 +1,16 @@ +/* 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_WIN32 +# define DSO_EXTENSION ".dll" +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h new file mode 100644 index 0000000..576fcbe --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h @@ -0,0 +1,16 @@ +/* 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_WIN32 +# define DSO_EXTENSION ".dll" +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h new file mode 120000 index 0000000..d732646 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h @@ -0,0 +1 @@ +../platform.h \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.h new file mode 100644 index 0000000..2c3b479 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.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 ".so" +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.h new file mode 100644 index 0000000..2c3b479 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.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 ".so" +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-macos.h new file mode 100644 index 0000000..d2e22e2 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-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/dso_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-mingw32.h new file mode 100644 index 0000000..816754e --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-mingw32.h @@ -0,0 +1,16 @@ +/* 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_WIN32 +# define DSO_EXTENSION ".dll" +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h new file mode 100644 index 0000000..576fcbe --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h @@ -0,0 +1,16 @@ +/* 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_WIN32 +# define DSO_EXTENSION ".dll" +#endif diff --git a/libcrypto/libcrypto/downstream/crypto/platform.h b/libcrypto/libcrypto/downstream/crypto/platform.h new file mode 100644 index 0000000..1ec5c81 --- /dev/null +++ b/libcrypto/libcrypto/downstream/crypto/platform.h @@ -0,0 +1,72 @@ +/* file : libcrypto/downstream/crypto/platform.h -*- C -*- + * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file + */ + +/* + * 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 + * as follows: + * + * - Create foo/. + * + * - Symlink platform.h into foo/. + * + * - Copy upstream's auto-generated for different platforms foo.h into foo/, + * using the `-[-].h` naming convention (see + * below for exact names). + * + * - Create foo.h including foo/platform.h. + * + * See bn_conf.h for the real example. + */ + +#ifndef _WIN32 +# if defined(__x86_64__) /* POSIX x86_64 */ +# if defined(__linux__) +# include "x86_64-linux.h" +# elif defined(__FreeBSD__) +# include "x86_64-freebsd.h" +# elif defined(__APPLE__) +# include "x86_64-macos.h" +# else +# error x86_64 architecture is not supported for this OS +# endif +# elif defined(__i386__) /* POSIX i386 */ +# if defined(__linux__) +# include "i686-linux.h" +/* + * i686 architecture is not currently supported for FreeBSD and Mac OS. + */ +/* +# elif defined(__FreeBSD__) +# include "i686-freebsd.h" +# elif defined(__APPLE__) +# include "i686-macos.h" +*/ +# else +# error i686 architecture is not supported for this OS +# endif +# else +# error unknown architecture +# endif +#else +# if defined(_WIN64) /* Windows x86_64 */ +# if defined(_MSC_VER) +# include "x86_64-win32-msvc.h" +# elif defined(__MINGW32__) +# include "x86_64-win32-mingw32.h" +# else +# error x86_64 architecture is not supported for this compiler +# endif +# else /* Windows i386 */ +# if defined(_MSC_VER) +# include "i686-win32-msvc.h" +# elif defined(__MINGW32__) +# include "i686-win32-mingw32.h" +# else +# error i686 architecture is not supported for this compiler +# endif +# endif +#endif diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf.h b/libcrypto/libcrypto/downstream/internal/bn_conf.h deleted file mode 100644 index bdbf8bc..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf.h +++ /dev/null @@ -1,13 +0,0 @@ -/* file : libcrypto/downstream/internal/bn_conf.h -*- C -*- - * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file - */ - -#ifndef LIBCRYPTO_DOWNSTREAM_INTERNAL_BN_CONF_H -#define LIBCRYPTO_DOWNSTREAM_INTERNAL_BN_CONF_H - -/* - * Include upstream's auto-generated platform-specific bn_conf.h. - */ -#include - -#endif /* LIBCRYPTO_DOWNSTREAM_INTERNAL_BN_CONF_H */ diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf.h.in.orig b/libcrypto/libcrypto/downstream/internal/bn_conf.h.in.orig deleted file mode 120000 index 5bb452b..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf.h.in.orig +++ /dev/null @@ -1 +0,0 @@ -../../crypto/include/internal/bn_conf.h.in \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-linux.h b/libcrypto/libcrypto/downstream/internal/bn_conf/i686-linux.h deleted file mode 100644 index ae0c797..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-linux.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_BN_CONF_H -# define HEADER_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 */ -#undef SIXTY_FOUR_BIT_LONG -#undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT - -#endif diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h deleted file mode 100644 index ae0c797..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_BN_CONF_H -# define HEADER_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 */ -#undef SIXTY_FOUR_BIT_LONG -#undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT - -#endif diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h deleted file mode 100644 index 8bf99bf..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\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 HEADER_BN_CONF_H -# define HEADER_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 */ -#undef SIXTY_FOUR_BIT_LONG -#undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT - -#endif diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/platform.h b/libcrypto/libcrypto/downstream/internal/bn_conf/platform.h deleted file mode 120000 index d732646..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/platform.h +++ /dev/null @@ -1 +0,0 @@ -../platform.h \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h deleted file mode 100644 index bfc2761..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_BN_CONF_H -# define HEADER_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/internal/bn_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-linux.h deleted file mode 100644 index bfc2761..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-linux.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_BN_CONF_H -# define HEADER_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/internal/bn_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-macos.h deleted file mode 100644 index bfc2761..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-macos.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_BN_CONF_H -# define HEADER_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/internal/bn_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-mingw32.h deleted file mode 100644 index fd43626..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-mingw32.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_BN_CONF_H -# define HEADER_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 */ -#undef SIXTY_FOUR_BIT_LONG -#define SIXTY_FOUR_BIT -#undef THIRTY_TWO_BIT - -#endif diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h deleted file mode 100644 index 2a89bad..0000000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h +++ /dev/null @@ -1,28 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\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 HEADER_BN_CONF_H -# define HEADER_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 */ -#undef SIXTY_FOUR_BIT_LONG -#define SIXTY_FOUR_BIT -#undef THIRTY_TWO_BIT - -#endif diff --git a/libcrypto/libcrypto/downstream/internal/buildinf.h b/libcrypto/libcrypto/downstream/internal/buildinf.h deleted file mode 100644 index cfb656f..0000000 --- a/libcrypto/libcrypto/downstream/internal/buildinf.h +++ /dev/null @@ -1,14 +0,0 @@ -/* file : libcrypto/downstream/internal/buildinf.h -*- C -*- - * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file - */ - -/* - * 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" - * - * We proxy the inclusion for the headers auto-generating machinery to work - * properly. - */ -#include diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf.h b/libcrypto/libcrypto/downstream/internal/dso_conf.h deleted file mode 100644 index 57990e7..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf.h +++ /dev/null @@ -1,13 +0,0 @@ -/* file : libcrypto/downstream/internal/dso_conf.h -*- C -*- - * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file - */ - -#ifndef LIBCRYPTO_DOWNSTREAM_INTERNAL_DSO_CONF_H -#define LIBCRYPTO_DOWNSTREAM_INTERNAL_DSO_CONF_H - -/* - * Include upstream's auto-generated platform-specific dso_conf.h. - */ -#include - -#endif /* LIBCRYPTO_DOWNSTREAM_INTERNAL_DSO_CONF_H */ diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf.h.in.orig b/libcrypto/libcrypto/downstream/internal/dso_conf.h.in.orig deleted file mode 120000 index 22614df..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf.h.in.orig +++ /dev/null @@ -1 +0,0 @@ -../../crypto/include/internal/dso_conf.h.in \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-linux.h b/libcrypto/libcrypto/downstream/internal/dso_conf/i686-linux.h deleted file mode 100644 index f938c33..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-linux.h +++ /dev/null @@ -1,17 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_DLFCN -# define HAVE_DLFCN_H -# define DSO_EXTENSION ".so" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h deleted file mode 100644 index 1856a5a..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h +++ /dev/null @@ -1,16 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_WIN32 -# define DSO_EXTENSION ".dll" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-msvc.h deleted file mode 100644 index e48dd73..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-msvc.h +++ /dev/null @@ -1,16 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_WIN32 -# define DSO_EXTENSION ".dll" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/platform.h b/libcrypto/libcrypto/downstream/internal/dso_conf/platform.h deleted file mode 120000 index d732646..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/platform.h +++ /dev/null @@ -1 +0,0 @@ -../platform.h \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h deleted file mode 100644 index f938c33..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h +++ /dev/null @@ -1,17 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_DLFCN -# define HAVE_DLFCN_H -# define DSO_EXTENSION ".so" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h deleted file mode 100644 index f938c33..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h +++ /dev/null @@ -1,17 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_DLFCN -# define HAVE_DLFCN_H -# define DSO_EXTENSION ".so" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h deleted file mode 100644 index bff012c..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h +++ /dev/null @@ -1,17 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_DLFCN -# define HAVE_DLFCN_H -# define DSO_EXTENSION ".dylib" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h deleted file mode 100644 index 1856a5a..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h +++ /dev/null @@ -1,16 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_WIN32 -# define DSO_EXTENSION ".dll" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-msvc.h deleted file mode 100644 index e48dd73..0000000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-msvc.h +++ /dev/null @@ -1,16 +0,0 @@ -/* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\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 HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_WIN32 -# define DSO_EXTENSION ".dll" -#endif diff --git a/libcrypto/libcrypto/downstream/internal/platform.h b/libcrypto/libcrypto/downstream/internal/platform.h deleted file mode 100644 index e3badb6..0000000 --- a/libcrypto/libcrypto/downstream/internal/platform.h +++ /dev/null @@ -1,72 +0,0 @@ -/* file : libcrypto/downstream/internal/platform.h -*- C -*- - * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file - */ - -/* - * 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 - * as follows: - * - * - Create foo/. - * - * - Symlink platform.h into foo/. - * - * - Copy upstream's auto-generated for different platforms foo.h into foo/, - * using the `-[-].h` naming convention (see - * below for exact names). - * - * - Create foo.h including foo/platform.h. - * - * See bn_conf.h for the real example. - */ - -#ifndef _WIN32 -# if defined(__x86_64__) /* POSIX x86_64 */ -# if defined(__linux__) -# include "x86_64-linux.h" -# elif defined(__FreeBSD__) -# include "x86_64-freebsd.h" -# elif defined(__APPLE__) -# include "x86_64-macos.h" -# else -# error x86_64 architecture is not supported for this OS -# endif -# elif defined(__i386__) /* POSIX i386 */ -# if defined(__linux__) -# include "i686-linux.h" -/* - * i686 architecture is not currently supported for FreeBSD and Mac OS. - */ -/* -# elif defined(__FreeBSD__) -# include "i686-freebsd.h" -# elif defined(__APPLE__) -# include "i686-macos.h" -*/ -# else -# error i686 architecture is not supported for this OS -# endif -# else -# error unknown architecture -# endif -#else -# if defined(_WIN64) /* Windows x86_64 */ -# if defined(_MSC_VER) -# include "x86_64-win32-msvc.h" -# elif defined(__MINGW32__) -# include "x86_64-win32-mingw32.h" -# else -# error x86_64 architecture is not supported for this compiler -# endif -# else /* Windows i386 */ -# if defined(_MSC_VER) -# include "i686-win32-msvc.h" -# elif defined(__MINGW32__) -# include "i686-win32-mingw32.h" -# else -# error i686 architecture is not supported for this compiler -# endif -# endif -#endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig b/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig index 90cab9f..3de20e5 120000 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig @@ -1 +1 @@ -../../openssl/opensslconf.h.in \ No newline at end of file +../../include/openssl/opensslconf.h.in \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h index 3016862..4fe7e1c 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h @@ -36,6 +36,9 @@ extern "C" { #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 @@ -87,9 +90,6 @@ extern "C" { #ifndef OPENSSL_NO_STATIC_ENGINE # define OPENSSL_NO_STATIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h index 892bfad..45442b7 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h @@ -36,6 +36,9 @@ extern "C" { #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 @@ -87,9 +90,6 @@ extern "C" { #ifndef OPENSSL_NO_STATIC_ENGINE # define OPENSSL_NO_STATIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h index 258233b..3aa576e 120000 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h @@ -1 +1 @@ -../../internal/platform.h \ No newline at end of file +../../crypto/platform.h \ No newline at end of file diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h index 6474e68..1243f27 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h @@ -33,6 +33,9 @@ extern "C" { #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 @@ -84,9 +87,6 @@ extern "C" { #ifndef OPENSSL_NO_STATIC_ENGINE # define OPENSSL_NO_STATIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h index 502c61e..33d3468 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h @@ -36,6 +36,9 @@ extern "C" { #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 @@ -87,9 +90,6 @@ extern "C" { #ifndef OPENSSL_NO_STATIC_ENGINE # define OPENSSL_NO_STATIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h index 283367d..fae3465 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h @@ -36,6 +36,9 @@ extern "C" { #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 @@ -87,9 +90,6 @@ extern "C" { #ifndef OPENSSL_NO_STATIC_ENGINE # define OPENSSL_NO_STATIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h index 1fc6036..4df6e6d 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h @@ -36,6 +36,9 @@ extern "C" { #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 @@ -87,9 +90,6 @@ extern "C" { #ifndef OPENSSL_NO_STATIC_ENGINE # define OPENSSL_NO_STATIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* -- cgit v1.1