Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2020-10-09 20:32:41 +0300
committerGitHub <noreply@github.com>2020-10-09 20:32:41 +0300
commit28c2463854a503bb5c559b88e584f3de66711b21 (patch)
tree6ee44414e675cd26bb6aaa21c511ed92d0f3ab1e /src
parent159ac08d971e93c8c20d16b4d95ab177e7587845 (diff)
Do not define X509_new as local_X509_new (#43159)
This was only being done for OpenSSL 1.0. X509_new is actually available to use in OpenSSL 1.0 and doesn't need to be re-defined: https://www.openssl.org/docs/man1.0.2/man3/X509_new.html. That document even says: "X509_new() and X509_free() are available in all versions of SSLeay and OpenSSL". The current libraries code doesn't contain an implementation of local_X509_new. If we define X509_new as local_X509_new, it breaks the build when it's being compiled non-portable against OpenSSL 1.0. See https://github.com/dotnet/runtime/issues/42991 for complete details. I was able to reproduce this on Fedora 29 when building using OpenSSL 1.0 headers. The error doesn't happen when building using OpenSSL 1.1, since X509_new is never re-defined. Fixes: #42991 Co-authored-by: Omair Majid <omajid@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
index 0e0543b1409..0bfdde872bf 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
@@ -1092,7 +1092,6 @@ FOR_ALL_OPENSSL_FUNCTIONS
#define SSL_is_init_finished local_SSL_is_init_finished
#define X509_CRL_get0_nextUpdate local_X509_CRL_get0_nextUpdate
#define X509_NAME_get0_der local_X509_NAME_get0_der
-#define X509_new local_X509_new
#define X509_PUBKEY_get0_param local_X509_PUBKEY_get0_param
#define X509_STORE_CTX_get0_cert local_X509_STORE_CTX_get0_cert
#define X509_STORE_CTX_get0_chain local_X509_STORE_CTX_get0_chain