diff options
Diffstat (limited to 'libcrypto/libcrypto/downstream')
36 files changed, 98 insertions, 98 deletions
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 <crypto/bn_conf/platform.h> + +#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/internal/bn_conf/i686-linux.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.h index ae0c797..16d6e93 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-linux.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from ../include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.h index ae0c797..16d6e93 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from ../include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.h index 8bf99bf..d53620f 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\bn_conf.h.in */ +/* Generated by makefile from ..\include\crypto\bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/platform.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h index d732646..d732646 120000 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/platform.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.h index bfc2761..0bacac0 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from ../include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-linux.h index bfc2761..0bacac0 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-linux.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-linux.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from ../include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-macos.h index bfc2761..0bacac0 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-macos.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-macos.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from ../include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-mingw32.h index fd43626..8bcd127 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-mingw32.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from ../include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.h index 2a89bad..2d8fa64 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\bn_conf.h.in */ +/* Generated by makefile from ..\include\crypto\bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#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 diff --git a/libcrypto/libcrypto/downstream/internal/buildinf.h b/libcrypto/libcrypto/downstream/crypto/buildinf.h index cfb656f..938b93f 100644 --- a/libcrypto/libcrypto/downstream/internal/buildinf.h +++ b/libcrypto/libcrypto/downstream/crypto/buildinf.h @@ -1,4 +1,4 @@ -/* file : libcrypto/downstream/internal/buildinf.h -*- C -*- +/* file : libcrypto/downstream/crypto/buildinf.h -*- C -*- * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ 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 <crypto/dso_conf/platform.h> + +#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/internal/dso_conf/i686-linux.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.h index f938c33..2c3b479 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-linux.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from ../include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h index 1856a5a..816754e 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from ../include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#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/internal/dso_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h index e48dd73..576fcbe 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\dso_conf.h.in */ +/* Generated by makefile from ..\include\crypto\dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#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/internal/dso_conf/platform.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h index d732646..d732646 120000 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/platform.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.h index f938c33..2c3b479 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from ../include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.h index f938c33..2c3b479 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from ../include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-macos.h index bff012c..d2e22e2 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-macos.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from ../include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".dylib" diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-mingw32.h index 1856a5a..816754e 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-mingw32.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from ../include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#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/internal/dso_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h index e48dd73..576fcbe 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from ..\crypto\include\internal\dso_conf.h.in */ +/* Generated by makefile from ..\include\crypto\dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#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/internal/platform.h b/libcrypto/libcrypto/downstream/crypto/platform.h index e3badb6..1ec5c81 100644 --- a/libcrypto/libcrypto/downstream/internal/platform.h +++ b/libcrypto/libcrypto/downstream/crypto/platform.h @@ -1,4 +1,4 @@ -/* file : libcrypto/downstream/internal/platform.h -*- C -*- +/* file : libcrypto/downstream/crypto/platform.h -*- C -*- * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ 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 <internal/bn_conf/platform.h> - -#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/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 <internal/dso_conf/platform.h> - -#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/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 /* |