Merge branch 'renegoLinuxPoC' of github.com:aik-jahoda/runtime into r…

…enegoLinuxPoC
dotnet · Jul 1, 2021 · ca00e71 · ca00e71
2 parents 100bb82 + d86628b
commit ca00e71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.c
@@ -72,6 +72,7 @@ int OpenLibrary()
  strcat(soName, versionOverride);
 #endif
 
+ printf("%s:%d %s \n", __FILE__, __LINE__, soName);
  DlOpen(soName);
  }
 

diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
@@ -492,7 +492,7 @@ const EVP_CIPHER* EVP_chacha20_poly1305(void);
  REQUIRED_FUNCTION(SSL_set_accept_state) \
  REQUIRED_FUNCTION(SSL_set_bio) \
  REQUIRED_FUNCTION(SSL_set_connect_state) \
- REQUIRED_FUNCTION(SSL_set_options) \
+ FALLBACK_FUNCTION(SSL_set_options) \
  REQUIRED_FUNCTION(SSL_set_verify) \
  REQUIRED_FUNCTION(SSL_shutdown) \
  LEGACY_FUNCTION(SSL_state) \

diff --git a/...libraries/System.Net.Security/tests/FunctionalTests/SslStreamNegotiatedCipherSuiteTest.cs b/...libraries/System.Net.Security/tests/FunctionalTests/SslStreamNegotiatedCipherSuiteTest.cs
@@ -576,7 +576,7 @@ private static IReadOnlyList<TlsCipherSuite> GetSupportedNonTls13CipherSuites()
  return null;
 
  var ret = new List<TlsCipherSuite>();
- //AllowOneOnOneSide(GetNonTls13CipherSuites(), (cs) => false, (cs) => ret.Add(cs));
+ AllowOneOnOneSide(GetNonTls13CipherSuites(), (cs) => false, (cs) => ret.Add(cs));
 
  return ret;
  }