diff options
| author | Guomin Jiang <guomin.jiang@intel.com> | 2020-07-10 09:47:31 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-07-25 06:27:14 +0000 |
| commit | 8c30327debb28c0b6cfa2106b736774e0b20daac (patch) | |
| tree | 646f87e8a445dd383e5f351900d92c874b7a9f2e /CryptoPkg/Library/Include | |
| parent | 91e4bcb313f0c1f0f19b87b5849f5486aa076be4 (diff) | |
| download | edk2-8c30327debb28c0b6cfa2106b736774e0b20daac.tar.gz edk2-8c30327debb28c0b6cfa2106b736774e0b20daac.tar.bz2 edk2-8c30327debb28c0b6cfa2106b736774e0b20daac.zip | |
CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g
Upgrade openssl to 1.1.1g. the directory have been reorganized,
openssl moved crypto/include/internal to include/crypto folder.
So we change directory to match the re-organization.
The dso_conf.h and opensslconf.h will generated in UNIX format,
change process_files.pl to covent the EOL automatically.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Diffstat (limited to 'CryptoPkg/Library/Include')
| -rw-r--r-- | CryptoPkg/Library/Include/crypto/dso_conf.h (renamed from CryptoPkg/Library/Include/internal/dso_conf.h) | 32 | ||||
| -rw-r--r-- | CryptoPkg/Library/Include/openssl/opensslconf.h | 3 |
2 files changed, 16 insertions, 19 deletions
diff --git a/CryptoPkg/Library/Include/internal/dso_conf.h b/CryptoPkg/Library/Include/crypto/dso_conf.h index 43c891588b..95f4db2b15 100644 --- a/CryptoPkg/Library/Include/internal/dso_conf.h +++ b/CryptoPkg/Library/Include/crypto/dso_conf.h @@ -1,16 +1,16 @@ -/* WARNING: do not edit! */ -/* Generated 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_NONE -# define DSO_EXTENSION ".so" -#endif +/* WARNING: do not edit! */
+/* Generated 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_NONE
+# define DSO_EXTENSION ".so"
+#endif
diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h index 62c2736cb0..3a2544ea5c 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -247,9 +247,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE
# define OPENSSL_NO_DYNAMIC_ENGINE
#endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
/*
|