Skip to content

[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonrozsival merged 4 commits into from
Dec 16, 2022
Merged

[Android] Fix SslStream.IsMutuallyAuthenticated #79601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
927d85d
Implement CertificateValidationPal.IsLocalCertificateUsed on Android
simonrozsival Dec 5, 2022
4d40c50
Enable test on Android
simonrozsival Dec 13, 2022
2e00f68
Update comment
simonrozsival Dec 13, 2022
b9684a2
Merge branch 'main' of https://github.com/dotnet/runtime into android…
simonrozsival Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
throw new SslException();
}

[LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
[return: MarshalAs(UnmanagedType.U1)]
internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

[LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down
12 changes: 9 additions & 3 deletions src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
return cert;
}

// This is only called when we selected local client certificate.
// Currently this is only when Java crypto asked for it.
internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
// Check if the local certificate has been sent to the peer during the handshake.
internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
{
SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
if (sslContext == null)
return false;

return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
}

//
// Used only by client SSL code, never returns null.
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
[ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
SslProtocols protocol)
{
Expand Down
2 changes: 2 additions & 0 deletions src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down
1 change: 1 addition & 0 deletions src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down
19 changes: 19 additions & 0 deletions src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
abort_if_invalid_pointer_argument(sslStream);
JNIEnv* env = GetJNIEnv();

bool ret = false;
INIT_LOCALS(loc, localCertificates);

// X509Certificate[] localCertificates = sslSession.getLocalCertificates();
loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

ret = loc[localCertificates] != NULL;

cleanup:
RELEASE_LOCALS(loc, env);
return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
abort_if_invalid_pointer_argument (sslStream);
Expand Down
7 changes: 7 additions & 0 deletions src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[Android] Fix SslStream.IsMutuallyAuthenticated by simonrozsival · Pull Request #79601 · dotnet/runtime · GitHub
Skip to content
[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 4 commits into

from

Dec 16, 2022
 Merged


[Android] Fix SslStream.IsMutuallyAuthenticated
#79601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
927d85d

Implement CertificateValidationPal.IsLocalCertificateUsed on Android


simonrozsival Dec 5, 2022
4d40c50

Enable test on Android


simonrozsival Dec 13, 2022
2e00f68

Update comment


simonrozsival Dec 13, 2022
b9684a2

Merge branch 'main' of https://github.com/dotnet/runtime into android…


simonrozsival Dec 13, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
 throw new SslException();
 }

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
 [return: MarshalAs(UnmanagedType.U1)]
 internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
 internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down

12 changes: 9 additions & 3 deletions
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
 return cert;
 }

 // This is only called when we selected local client certificate.
 // Currently this is only when Java crypto asked for it.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
 // Check if the local certificate has been sent to the peer during the handshake.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
 {
 SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
 if (sslContext == null)
 return false;

 return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
 }

 //
 // Used only by client SSL code, never returns null.
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

 [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
 [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
 public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
 SslProtocols protocol)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
 g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
 g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
 g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
 g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down

1 change: 1 addition & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down

19 changes: 19 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument(sslStream);
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, localCertificates);

 // X509Certificate[] localCertificates = sslSession.getLocalCertificates();
 loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

 ret = loc[localCertificates] != NULL;

cleanup:
 RELEASE_LOCALS(loc, env);
 return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument (sslStream);
Expand Down

7 changes: 7 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Android] Fix SslStream.IsMutuallyAuthenticated by simonrozsival · Pull Request #79601 · dotnet/runtime · GitHub
Skip to content
[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 4 commits into

from

Dec 16, 2022
 Merged


[Android] Fix SslStream.IsMutuallyAuthenticated
#79601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
927d85d

Implement CertificateValidationPal.IsLocalCertificateUsed on Android


simonrozsival Dec 5, 2022
4d40c50

Enable test on Android


simonrozsival Dec 13, 2022
2e00f68

Update comment


simonrozsival Dec 13, 2022
b9684a2

Merge branch 'main' of https://github.com/dotnet/runtime into android…


simonrozsival Dec 13, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
 throw new SslException();
 }

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
 [return: MarshalAs(UnmanagedType.U1)]
 internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
 internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down

12 changes: 9 additions & 3 deletions
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
 return cert;
 }

 // This is only called when we selected local client certificate.
 // Currently this is only when Java crypto asked for it.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
 // Check if the local certificate has been sent to the peer during the handshake.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
 {
 SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
 if (sslContext == null)
 return false;

 return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
 }

 //
 // Used only by client SSL code, never returns null.
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

 [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
 [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
 public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
 SslProtocols protocol)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
 g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
 g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
 g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
 g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down

1 change: 1 addition & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down

19 changes: 19 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument(sslStream);
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, localCertificates);

 // X509Certificate[] localCertificates = sslSession.getLocalCertificates();
 loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

 ret = loc[localCertificates] != NULL;

cleanup:
 RELEASE_LOCALS(loc, env);
 return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument (sslStream);
Expand Down

7 changes: 7 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Android] Fix SslStream.IsMutuallyAuthenticated by simonrozsival · Pull Request #79601 · dotnet/runtime · GitHub
Skip to content
[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 4 commits into

from

Dec 16, 2022
 Merged


[Android] Fix SslStream.IsMutuallyAuthenticated
#79601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
927d85d

Implement CertificateValidationPal.IsLocalCertificateUsed on Android


simonrozsival Dec 5, 2022
4d40c50

Enable test on Android


simonrozsival Dec 13, 2022
2e00f68

Update comment


simonrozsival Dec 13, 2022
b9684a2

Merge branch 'main' of https://github.com/dotnet/runtime into android…


simonrozsival Dec 13, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
 throw new SslException();
 }

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
 [return: MarshalAs(UnmanagedType.U1)]
 internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
 internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down

12 changes: 9 additions & 3 deletions
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
 return cert;
 }

 // This is only called when we selected local client certificate.
 // Currently this is only when Java crypto asked for it.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
 // Check if the local certificate has been sent to the peer during the handshake.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
 {
 SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
 if (sslContext == null)
 return false;

 return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
 }

 //
 // Used only by client SSL code, never returns null.
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

 [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
 [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
 public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
 SslProtocols protocol)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
 g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
 g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
 g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
 g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down

1 change: 1 addition & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down

19 changes: 19 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument(sslStream);
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, localCertificates);

 // X509Certificate[] localCertificates = sslSession.getLocalCertificates();
 loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

 ret = loc[localCertificates] != NULL;

cleanup:
 RELEASE_LOCALS(loc, env);
 return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument (sslStream);
Expand Down

7 changes: 7 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[Android] Fix SslStream.IsMutuallyAuthenticated by simonrozsival · Pull Request #79601 · dotnet/runtime · GitHub
Skip to content
[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 4 commits into

from

Dec 16, 2022
 Merged


[Android] Fix SslStream.IsMutuallyAuthenticated
#79601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
927d85d

Implement CertificateValidationPal.IsLocalCertificateUsed on Android


simonrozsival Dec 5, 2022
4d40c50

Enable test on Android


simonrozsival Dec 13, 2022
2e00f68

Update comment


simonrozsival Dec 13, 2022
b9684a2

Merge branch 'main' of https://github.com/dotnet/runtime into android…


simonrozsival Dec 13, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
 throw new SslException();
 }

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
 [return: MarshalAs(UnmanagedType.U1)]
 internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
 internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down

12 changes: 9 additions & 3 deletions
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
 return cert;
 }

 // This is only called when we selected local client certificate.
 // Currently this is only when Java crypto asked for it.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
 // Check if the local certificate has been sent to the peer during the handshake.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
 {
 SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
 if (sslContext == null)
 return false;

 return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
 }

 //
 // Used only by client SSL code, never returns null.
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

 [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
 [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
 public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
 SslProtocols protocol)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
 g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
 g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
 g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
 g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down

1 change: 1 addition & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down

19 changes: 19 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument(sslStream);
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, localCertificates);

 // X509Certificate[] localCertificates = sslSession.getLocalCertificates();
 loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

 ret = loc[localCertificates] != NULL;

cleanup:
 RELEASE_LOCALS(loc, env);
 return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument (sslStream);
Expand Down

7 changes: 7 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Android] Fix SslStream.IsMutuallyAuthenticated by simonrozsival · Pull Request #79601 · dotnet/runtime · GitHub
Skip to content
[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 4 commits into

from

Dec 16, 2022
 Merged


[Android] Fix SslStream.IsMutuallyAuthenticated
#79601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
927d85d

Implement CertificateValidationPal.IsLocalCertificateUsed on Android


simonrozsival Dec 5, 2022
4d40c50

Enable test on Android


simonrozsival Dec 13, 2022
2e00f68

Update comment


simonrozsival Dec 13, 2022
b9684a2

Merge branch 'main' of https://github.com/dotnet/runtime into android…


simonrozsival Dec 13, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
 throw new SslException();
 }

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
 [return: MarshalAs(UnmanagedType.U1)]
 internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
 internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down

12 changes: 9 additions & 3 deletions
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
 return cert;
 }

 // This is only called when we selected local client certificate.
 // Currently this is only when Java crypto asked for it.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
 // Check if the local certificate has been sent to the peer during the handshake.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
 {
 SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
 if (sslContext == null)
 return false;

 return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
 }

 //
 // Used only by client SSL code, never returns null.
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

 [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
 [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
 public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
 SslProtocols protocol)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
 g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
 g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
 g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
 g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down

1 change: 1 addition & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down

19 changes: 19 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument(sslStream);
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, localCertificates);

 // X509Certificate[] localCertificates = sslSession.getLocalCertificates();
 loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

 ret = loc[localCertificates] != NULL;

cleanup:
 RELEASE_LOCALS(loc, env);
 return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument (sslStream);
Expand Down

7 changes: 7 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Android] Fix SslStream.IsMutuallyAuthenticated by simonrozsival · Pull Request #79601 · dotnet/runtime · GitHub
Skip to content
[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 4 commits into

from

Dec 16, 2022
 Merged


[Android] Fix SslStream.IsMutuallyAuthenticated
#79601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
927d85d

Implement CertificateValidationPal.IsLocalCertificateUsed on Android


simonrozsival Dec 5, 2022
4d40c50

Enable test on Android


simonrozsival Dec 13, 2022
2e00f68

Update comment


simonrozsival Dec 13, 2022
b9684a2

Merge branch 'main' of https://github.com/dotnet/runtime into android…


simonrozsival Dec 13, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
 throw new SslException();
 }

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
 [return: MarshalAs(UnmanagedType.U1)]
 internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
 internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down

12 changes: 9 additions & 3 deletions
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
 return cert;
 }

 // This is only called when we selected local client certificate.
 // Currently this is only when Java crypto asked for it.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
 // Check if the local certificate has been sent to the peer during the handshake.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
 {
 SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
 if (sslContext == null)
 return false;

 return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
 }

 //
 // Used only by client SSL code, never returns null.
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

 [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
 [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
 public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
 SslProtocols protocol)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
 g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
 g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
 g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
 g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down

1 change: 1 addition & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down

19 changes: 19 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument(sslStream);
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, localCertificates);

 // X509Certificate[] localCertificates = sslSession.getLocalCertificates();
 loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

 ret = loc[localCertificates] != NULL;

cleanup:
 RELEASE_LOCALS(loc, env);
 return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument (sslStream);
Expand Down

7 changes: 7 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[Android] Fix SslStream.IsMutuallyAuthenticated by simonrozsival · Pull Request #79601 · dotnet/runtime · GitHub
Skip to content
[Android] Fix SslStream.IsMutuallyAuthenticated#79601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 4 commits into

from

Dec 16, 2022
 Merged


[Android] Fix SslStream.IsMutuallyAuthenticated
#79601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
927d85d

Implement CertificateValidationPal.IsLocalCertificateUsed on Android


simonrozsival Dec 5, 2022
4d40c50

Enable test on Android


simonrozsival Dec 13, 2022
2e00f68

Update comment


simonrozsival Dec 13, 2022
b9684a2

Merge branch 'main' of https://github.com/dotnet/runtime into android…


simonrozsival Dec 13, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
...ies/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Ssl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,10 @@ internal static void SSLStreamSetTargetHost(
 throw new SslException();
 }

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamIsLocalCertificateUsed")]
 [return: MarshalAs(UnmanagedType.U1)]
 internal static partial bool SSLStreamIsLocalCertificateUsed(SafeSslHandle sslHandle);

 [LibraryImport(Interop.Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_SSLStreamRequestClientAuthentication")]
 internal static partial void SSLStreamRequestClientAuthentication(SafeSslHandle sslHandle);

Expand Down

12 changes: 9 additions & 3 deletions
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,15 @@ internal static SslPolicyErrors VerifyCertificateProperties(
 return cert;
 }

 // This is only called when we selected local client certificate.
 // Currently this is only when Java crypto asked for it.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? _) => true;
 // Check if the local certificate has been sent to the peer during the handshake.
 internal static bool IsLocalCertificateUsed(SafeDeleteContext? securityContext)
 {
 SafeSslHandle? sslContext = ((SafeDeleteSslContext?)securityContext)?.SslContext;
 if (sslContext == null)
 return false;

 return Interop.AndroidCrypto.SSLStreamIsLocalCertificateUsed(sslContext);
 }

 //
 // Used only by client SSL code, never returns null.
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamMutualAuthenticationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,6 @@ public async Task SslStream_RequireClientCert_IsMutuallyAuthenticated_ReturnsTru

 [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindows7))]
 [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65563", TestPlatforms.Android)]
 public async Task SslStream_CachedCredentials_IsMutuallyAuthenticatedCorrect(
 SslProtocols protocol)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@ jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
jclass g_SSLSession;
jmethodID g_SSLSessionGetApplicationBufferSize;
jmethodID g_SSLSessionGetCipherSuite;
jmethodID g_SSLSessionGetLocalCertificates;
jmethodID g_SSLSessionGetPacketBufferSize;
jmethodID g_SSLSessionGetPeerCertificates;
jmethodID g_SSLSessionGetProtocol;
Expand DownExpand Up@@ -1054,6 +1055,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLSession = GetClassGRef(env, "javax/net/ssl/SSLSession");
 g_SSLSessionGetApplicationBufferSize = GetMethod(env, false, g_SSLSession, "getApplicationBufferSize", "()I");
 g_SSLSessionGetCipherSuite = GetMethod(env, false, g_SSLSession, "getCipherSuite", "()Ljava/lang/String;");
 g_SSLSessionGetLocalCertificates = GetMethod(env, false, g_SSLSession, "getLocalCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetPacketBufferSize = GetMethod(env, false, g_SSLSession, "getPacketBufferSize", "()I");
 g_SSLSessionGetPeerCertificates = GetMethod(env, false, g_SSLSession, "getPeerCertificates", "()[Ljava/security/cert/Certificate;");
 g_SSLSessionGetProtocol = GetMethod(env, false, g_SSLSession, "getProtocol", "()Ljava/lang/String;");
Expand Down

1 change: 1 addition & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,6 +477,7 @@ extern jmethodID g_SSLContextCreateSSLEngineMethodWithHostAndPort;
extern jclass g_SSLSession;
extern jmethodID g_SSLSessionGetApplicationBufferSize;
extern jmethodID g_SSLSessionGetCipherSuite;
extern jmethodID g_SSLSessionGetLocalCertificates;
extern jmethodID g_SSLSessionGetPacketBufferSize;
extern jmethodID g_SSLSessionGetPeerCertificates;
extern jmethodID g_SSLSessionGetProtocol;
Expand Down

19 changes: 19 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1039,6 +1039,25 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 return ret;
}

bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument(sslStream);
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, localCertificates);

 // X509Certificate[] localCertificates = sslSession.getLocalCertificates();
 loc[localCertificates] = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetLocalCertificates);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);

 ret = loc[localCertificates] != NULL;

cleanup:
 RELEASE_LOCALS(loc, env);
 return ret;
}

bool AndroidCryptoNative_SSLStreamShutdown(SSLStream* sslStream)
{
 abort_if_invalid_pointer_argument (sslStream);
Expand Down

7 changes: 7 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,13 @@ Returns 1 on success, 0 otherwise
*/
PALEXPORT int32_t AndroidCryptoNative_SSLStreamSetTargetHost(SSLStream* sslStream, char* targetHost);

/*
Check if the local certificate has been sent to the peer during the TLS handshake.

Returns true if the local certificate has been sent to the peer, false otherwise.
*/
PALEXPORT bool AndroidCryptoNative_SSLStreamIsLocalCertificateUsed(SSLStream* sslStream);

/*
Start or continue the TLS handshake
*/
Expand Down