Skip to content

[release/6.0] [Android] Remove repeated calls to beginHandshake#79039

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

Closed
github-actions wants to merge 1 commit into from
Closed

[release/6.0] [Android] Remove repeated calls to beginHandshake #79039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_jni.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -401,6 +401,7 @@ jmethodID g_SSLEngineBeginHandshake;
jmethodID g_SSLEngineCloseOutbound;
jmethodID g_SSLEngineGetApplicationProtocol;
jmethodID g_SSLEngineGetHandshakeStatus;
jmethodID g_SSLEngineGetHandshakeSession;
jmethodID g_SSLEngineGetSession;
jmethodID g_SSLEngineGetSSLParameters;
jmethodID g_SSLEngineGetSupportedProtocols;
Expand DownExpand Up@@ -970,6 +971,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
g_SSLEngineGetApplicationProtocol = GetOptionalMethod(env, false, g_SSLEngine, "getApplicationProtocol", "()Ljava/lang/String;");
g_SSLEngineGetHandshakeStatus = GetMethod(env, false, g_SSLEngine, "getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
g_SSLEngineGetSession = GetMethod(env, false, g_SSLEngine, "getSession", "()Ljavax/net/ssl/SSLSession;");
g_SSLEngineGetHandshakeSession = GetOptionalMethod(env, false, g_SSLEngine, "getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
g_SSLEngineGetSSLParameters = GetMethod(env, false, g_SSLEngine, "getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
g_SSLEngineGetSupportedProtocols = GetMethod(env, false, g_SSLEngine, "getSupportedProtocols", "()[Ljava/lang/String;");
g_SSLEngineSetEnabledProtocols = GetMethod(env, false, g_SSLEngine, "setEnabledProtocols", "([Ljava/lang/String;)V");
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_jni.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -415,6 +415,7 @@ extern jmethodID g_SSLEngineBeginHandshake;
extern jmethodID g_SSLEngineCloseOutbound;
extern jmethodID g_SSLEngineGetApplicationProtocol;
extern jmethodID g_SSLEngineGetHandshakeStatus;
extern jmethodID g_SSLEngineGetHandshakeSession;
extern jmethodID g_SSLEngineGetSession;
extern jmethodID g_SSLEngineGetSSLParameters;
extern jmethodID g_SSLEngineGetSupportedProtocols;
Expand Down
61 changes: 47 additions & 14 deletions src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,27 @@ static bool IsHandshaking(int handshakeStatus)
return handshakeStatus != HANDSHAKE_STATUS__NOT_HANDSHAKING && handshakeStatus != HANDSHAKE_STATUS__FINISHED;
}

static jobject GetSslSessionForHandshakeStatus(JNIEnv* env, SSLStream* sslStream, int handshakeStatus)
{
// SSLEngine.getHandshakeSession() is available since API 24
jobject sslSession = IsHandshaking(handshakeStatus) && g_SSLEngineGetHandshakeSession != NULL
? (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeSession)
: (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetSession);
if (CheckJNIExceptions(env))
return NULL;

return sslSession;
}

static jobject GetCurrentSslSession(JNIEnv* env, SSLStream* sslStream)
{
int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
if (CheckJNIExceptions(env))
return NULL;

return GetSslSessionForHandshakeStatus(env, sslStream, handshakeStatus);
}

ARGS_NON_NULL_ALL static PAL_SSLStreamStatus Close(JNIEnv* env, SSLStream* sslStream)
{
// Call wrap to clear any remaining data before closing
Expand DownExpand Up@@ -521,10 +542,13 @@ PAL_SSLStreamStatus AndroidCryptoNative_SSLStreamHandshake(SSLStream* sslStream)
abort_if_invalid_pointer_argument (sslStream);
JNIEnv* env = GetJNIEnv();

// sslEngine.beginHandshake();
(*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
if (CheckJNIExceptions(env))
return SSLStreamStatus_Error;
int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
if (!IsHandshaking(handshakeStatus)) {
// sslEngine.beginHandshake();
(*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
if (CheckJNIExceptions(env))
return SSLStreamStatus_Error;
}

return DoHandshake(env, sslStream);
}
Expand DownExpand Up@@ -703,14 +727,16 @@ int32_t AndroidCryptoNative_SSLStreamGetCipherSuite(SSLStream* sslStream, uint16
*out = NULL;

// String cipherSuite = sslSession.getCipherSuite();
jstring cipherSuite = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetCipherSuite);
jobject sslSession = GetCurrentSslSession(env, sslStream);
jstring cipherSuite = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetCipherSuite);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
*out = AllocateString(env, cipherSuite);

ret = SUCCESS;

cleanup:
(*env)->DeleteLocalRef(env, cipherSuite);
ReleaseLRef(env, sslSession);
ReleaseLRef(env, cipherSuite);
return ret;
}

Expand All@@ -724,14 +750,16 @@ int32_t AndroidCryptoNative_SSLStreamGetProtocol(SSLStream* sslStream, uint16_t*
*out = NULL;

// String protocol = sslSession.getProtocol();
jstring protocol = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetProtocol);
jobject sslSession = GetCurrentSslSession(env, sslStream);
jstring protocol = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetProtocol);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
*out = AllocateString(env, protocol);

ret = SUCCESS;

cleanup:
(*env)->DeleteLocalRef(env, protocol);
ReleaseLRef(env, sslSession);
ReleaseLRef(env, protocol);
return ret;
}

Expand All@@ -744,7 +772,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS

// Certificate[] certs = sslSession.getPeerCertificates();
// out = certs[0];
jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
jobject sslSession = GetCurrentSslSession(env, sslStream);
jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

// If there are no peer certificates, getPeerCertificates will throw. Return null to indicate no certificate.
if (TryClearJNIExceptions(env))
Expand All@@ -759,7 +788,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS
}

cleanup:
(*env)->DeleteLocalRef(env, certs);
ReleaseLRef(env, sslSession);
ReleaseLRef(env, certs);
return ret;
}

Expand All@@ -777,7 +807,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
// for (int i = 0; i < certs.length; i++) {
// out[i] = certs[i];
// }
jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
jobject sslSession = GetCurrentSslSession(env, sslStream);
jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

// If there are no peer certificates, getPeerCertificates will throw. Return null and length of zero to indicate no certificates.
if (TryClearJNIExceptions(env))
Expand All@@ -796,7 +827,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
}

cleanup:
(*env)->DeleteLocalRef(env, certs);
ReleaseLRef(env, sslSession);
ReleaseLRef(env, certs);
}

void AndroidCryptoNative_SSLStreamRequestClientAuthentication(SSLStream* sslStream)
Expand DownExpand Up@@ -910,14 +942,15 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
JNIEnv* env = GetJNIEnv();

bool ret = false;
INIT_LOCALS(loc, name, verifier);
INIT_LOCALS(loc, name, verifier, sslSession);

// HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
// return verifier.verify(hostname, sslSession);
loc[name] = make_java_string(env, hostname);
loc[sslSession] = GetCurrentSslSession(env, sslStream);
loc[verifier] =
(*env)->CallStaticObjectMethod(env, g_HttpsURLConnection, g_HttpsURLConnectionGetDefaultHostnameVerifier);
ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], sslStream->sslSession);
ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], loc[sslSession]);

RELEASE_LOCALS(loc, env);
return ret;
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" + '
[release/6.0] [Android] Remove repeated calls to beginHandshake by github-actions[bot] · Pull Request #79039 · dotnet/runtime · GitHub
Skip to content
[release/6.0] [Android] Remove repeated calls to beginHandshake#79039

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

 Closed

github-actions
wants to merge
1
commit into

from

 Closed


[release/6.0] [Android] Remove repeated calls to beginHandshake
#79039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -401,6 +401,7 @@ jmethodID g_SSLEngineBeginHandshake;
jmethodID g_SSLEngineCloseOutbound;
jmethodID g_SSLEngineGetApplicationProtocol;
jmethodID g_SSLEngineGetHandshakeStatus;
jmethodID g_SSLEngineGetHandshakeSession;
jmethodID g_SSLEngineGetSession;
jmethodID g_SSLEngineGetSSLParameters;
jmethodID g_SSLEngineGetSupportedProtocols;
Expand DownExpand Up@@ -970,6 +971,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLEngineGetApplicationProtocol = GetOptionalMethod(env, false, g_SSLEngine, "getApplicationProtocol", "()Ljava/lang/String;");
 g_SSLEngineGetHandshakeStatus = GetMethod(env, false, g_SSLEngine, "getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
 g_SSLEngineGetSession = GetMethod(env, false, g_SSLEngine, "getSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetHandshakeSession = GetOptionalMethod(env, false, g_SSLEngine, "getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetSSLParameters = GetMethod(env, false, g_SSLEngine, "getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
 g_SSLEngineGetSupportedProtocols = GetMethod(env, false, g_SSLEngine, "getSupportedProtocols", "()[Ljava/lang/String;");
 g_SSLEngineSetEnabledProtocols = GetMethod(env, false, g_SSLEngine, "setEnabledProtocols", "([Ljava/lang/String;)V");
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -415,6 +415,7 @@ extern jmethodID g_SSLEngineBeginHandshake;
extern jmethodID g_SSLEngineCloseOutbound;
extern jmethodID g_SSLEngineGetApplicationProtocol;
extern jmethodID g_SSLEngineGetHandshakeStatus;
extern jmethodID g_SSLEngineGetHandshakeSession;
extern jmethodID g_SSLEngineGetSession;
extern jmethodID g_SSLEngineGetSSLParameters;
extern jmethodID g_SSLEngineGetSupportedProtocols;
Expand Down

61 changes: 47 additions & 14 deletions
src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,27 @@ static bool IsHandshaking(int handshakeStatus)
 return handshakeStatus != HANDSHAKE_STATUS__NOT_HANDSHAKING && handshakeStatus != HANDSHAKE_STATUS__FINISHED;
}

static jobject GetSslSessionForHandshakeStatus(JNIEnv* env, SSLStream* sslStream, int handshakeStatus)
{
 // SSLEngine.getHandshakeSession() is available since API 24
 jobject sslSession = IsHandshaking(handshakeStatus) && g_SSLEngineGetHandshakeSession != NULL
 ? (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeSession)
 : (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetSession);
 if (CheckJNIExceptions(env))
 return NULL;

 return sslSession;
}

static jobject GetCurrentSslSession(JNIEnv* env, SSLStream* sslStream)
{
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (CheckJNIExceptions(env))
 return NULL;

 return GetSslSessionForHandshakeStatus(env, sslStream, handshakeStatus);
}

ARGS_NON_NULL_ALL static PAL_SSLStreamStatus Close(JNIEnv* env, SSLStream* sslStream)
{
 // Call wrap to clear any remaining data before closing
Expand DownExpand Up@@ -521,10 +542,13 @@ PAL_SSLStreamStatus AndroidCryptoNative_SSLStreamHandshake(SSLStream* sslStream)
 abort_if_invalid_pointer_argument (sslStream);
 JNIEnv* env = GetJNIEnv();

 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (!IsHandshaking(handshakeStatus)) {
 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 }

 return DoHandshake(env, sslStream);
}
Expand DownExpand Up@@ -703,14 +727,16 @@ int32_t AndroidCryptoNative_SSLStreamGetCipherSuite(SSLStream* sslStream, uint16
 *out = NULL;

 // String cipherSuite = sslSession.getCipherSuite();
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetCipherSuite);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetCipherSuite);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, cipherSuite);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, cipherSuite);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, cipherSuite);
 return ret;
}

Expand All@@ -724,14 +750,16 @@ int32_t AndroidCryptoNative_SSLStreamGetProtocol(SSLStream* sslStream, uint16_t*
 *out = NULL;

 // String protocol = sslSession.getProtocol();
 jstring protocol = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetProtocol);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring protocol = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetProtocol);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, protocol);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, protocol);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, protocol);
 return ret;
}

Expand All@@ -744,7 +772,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS

 // Certificate[] certs = sslSession.getPeerCertificates();
 // out = certs[0];
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null to indicate no certificate.
 if (TryClearJNIExceptions(env))
Expand All@@ -759,7 +788,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
 return ret;
}

Expand All@@ -777,7 +807,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 // for (int i = 0; i < certs.length; i++) {
 // out[i] = certs[i];
 // }
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null and length of zero to indicate no certificates.
 if (TryClearJNIExceptions(env))
Expand All@@ -796,7 +827,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
}

void AndroidCryptoNative_SSLStreamRequestClientAuthentication(SSLStream* sslStream)
Expand DownExpand Up@@ -910,14 +942,15 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, name, verifier);
 INIT_LOCALS(loc, name, verifier, sslSession);

 // HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
 // return verifier.verify(hostname, sslSession);
 loc[name] = make_java_string(env, hostname);
 loc[sslSession] = GetCurrentSslSession(env, sslStream);
 loc[verifier] =
 (*env)->CallStaticObjectMethod(env, g_HttpsURLConnection, g_HttpsURLConnectionGetDefaultHostnameVerifier);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], sslStream->sslSession);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], loc[sslSession]);

 RELEASE_LOCALS(loc, env);
 return ret;
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('^' + ".*" + '
[release/6.0] [Android] Remove repeated calls to beginHandshake by github-actions[bot] · Pull Request #79039 · dotnet/runtime · GitHub
Skip to content
[release/6.0] [Android] Remove repeated calls to beginHandshake#79039

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

 Closed

github-actions
wants to merge
1
commit into

from

 Closed


[release/6.0] [Android] Remove repeated calls to beginHandshake
#79039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -401,6 +401,7 @@ jmethodID g_SSLEngineBeginHandshake;
jmethodID g_SSLEngineCloseOutbound;
jmethodID g_SSLEngineGetApplicationProtocol;
jmethodID g_SSLEngineGetHandshakeStatus;
jmethodID g_SSLEngineGetHandshakeSession;
jmethodID g_SSLEngineGetSession;
jmethodID g_SSLEngineGetSSLParameters;
jmethodID g_SSLEngineGetSupportedProtocols;
Expand DownExpand Up@@ -970,6 +971,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLEngineGetApplicationProtocol = GetOptionalMethod(env, false, g_SSLEngine, "getApplicationProtocol", "()Ljava/lang/String;");
 g_SSLEngineGetHandshakeStatus = GetMethod(env, false, g_SSLEngine, "getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
 g_SSLEngineGetSession = GetMethod(env, false, g_SSLEngine, "getSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetHandshakeSession = GetOptionalMethod(env, false, g_SSLEngine, "getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetSSLParameters = GetMethod(env, false, g_SSLEngine, "getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
 g_SSLEngineGetSupportedProtocols = GetMethod(env, false, g_SSLEngine, "getSupportedProtocols", "()[Ljava/lang/String;");
 g_SSLEngineSetEnabledProtocols = GetMethod(env, false, g_SSLEngine, "setEnabledProtocols", "([Ljava/lang/String;)V");
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -415,6 +415,7 @@ extern jmethodID g_SSLEngineBeginHandshake;
extern jmethodID g_SSLEngineCloseOutbound;
extern jmethodID g_SSLEngineGetApplicationProtocol;
extern jmethodID g_SSLEngineGetHandshakeStatus;
extern jmethodID g_SSLEngineGetHandshakeSession;
extern jmethodID g_SSLEngineGetSession;
extern jmethodID g_SSLEngineGetSSLParameters;
extern jmethodID g_SSLEngineGetSupportedProtocols;
Expand Down

61 changes: 47 additions & 14 deletions
src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,27 @@ static bool IsHandshaking(int handshakeStatus)
 return handshakeStatus != HANDSHAKE_STATUS__NOT_HANDSHAKING && handshakeStatus != HANDSHAKE_STATUS__FINISHED;
}

static jobject GetSslSessionForHandshakeStatus(JNIEnv* env, SSLStream* sslStream, int handshakeStatus)
{
 // SSLEngine.getHandshakeSession() is available since API 24
 jobject sslSession = IsHandshaking(handshakeStatus) && g_SSLEngineGetHandshakeSession != NULL
 ? (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeSession)
 : (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetSession);
 if (CheckJNIExceptions(env))
 return NULL;

 return sslSession;
}

static jobject GetCurrentSslSession(JNIEnv* env, SSLStream* sslStream)
{
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (CheckJNIExceptions(env))
 return NULL;

 return GetSslSessionForHandshakeStatus(env, sslStream, handshakeStatus);
}

ARGS_NON_NULL_ALL static PAL_SSLStreamStatus Close(JNIEnv* env, SSLStream* sslStream)
{
 // Call wrap to clear any remaining data before closing
Expand DownExpand Up@@ -521,10 +542,13 @@ PAL_SSLStreamStatus AndroidCryptoNative_SSLStreamHandshake(SSLStream* sslStream)
 abort_if_invalid_pointer_argument (sslStream);
 JNIEnv* env = GetJNIEnv();

 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (!IsHandshaking(handshakeStatus)) {
 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 }

 return DoHandshake(env, sslStream);
}
Expand DownExpand Up@@ -703,14 +727,16 @@ int32_t AndroidCryptoNative_SSLStreamGetCipherSuite(SSLStream* sslStream, uint16
 *out = NULL;

 // String cipherSuite = sslSession.getCipherSuite();
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetCipherSuite);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetCipherSuite);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, cipherSuite);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, cipherSuite);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, cipherSuite);
 return ret;
}

Expand All@@ -724,14 +750,16 @@ int32_t AndroidCryptoNative_SSLStreamGetProtocol(SSLStream* sslStream, uint16_t*
 *out = NULL;

 // String protocol = sslSession.getProtocol();
 jstring protocol = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetProtocol);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring protocol = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetProtocol);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, protocol);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, protocol);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, protocol);
 return ret;
}

Expand All@@ -744,7 +772,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS

 // Certificate[] certs = sslSession.getPeerCertificates();
 // out = certs[0];
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null to indicate no certificate.
 if (TryClearJNIExceptions(env))
Expand All@@ -759,7 +788,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
 return ret;
}

Expand All@@ -777,7 +807,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 // for (int i = 0; i < certs.length; i++) {
 // out[i] = certs[i];
 // }
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null and length of zero to indicate no certificates.
 if (TryClearJNIExceptions(env))
Expand All@@ -796,7 +827,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
}

void AndroidCryptoNative_SSLStreamRequestClientAuthentication(SSLStream* sslStream)
Expand DownExpand Up@@ -910,14 +942,15 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, name, verifier);
 INIT_LOCALS(loc, name, verifier, sslSession);

 // HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
 // return verifier.verify(hostname, sslSession);
 loc[name] = make_java_string(env, hostname);
 loc[sslSession] = GetCurrentSslSession(env, sslStream);
 loc[verifier] =
 (*env)->CallStaticObjectMethod(env, g_HttpsURLConnection, g_HttpsURLConnectionGetDefaultHostnameVerifier);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], sslStream->sslSession);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], loc[sslSession]);

 RELEASE_LOCALS(loc, env);
 return ret;
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('^' + ".*" + '
[release/6.0] [Android] Remove repeated calls to beginHandshake by github-actions[bot] · Pull Request #79039 · dotnet/runtime · GitHub
Skip to content
[release/6.0] [Android] Remove repeated calls to beginHandshake#79039

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

 Closed

github-actions
wants to merge
1
commit into

from

 Closed


[release/6.0] [Android] Remove repeated calls to beginHandshake
#79039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -401,6 +401,7 @@ jmethodID g_SSLEngineBeginHandshake;
jmethodID g_SSLEngineCloseOutbound;
jmethodID g_SSLEngineGetApplicationProtocol;
jmethodID g_SSLEngineGetHandshakeStatus;
jmethodID g_SSLEngineGetHandshakeSession;
jmethodID g_SSLEngineGetSession;
jmethodID g_SSLEngineGetSSLParameters;
jmethodID g_SSLEngineGetSupportedProtocols;
Expand DownExpand Up@@ -970,6 +971,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLEngineGetApplicationProtocol = GetOptionalMethod(env, false, g_SSLEngine, "getApplicationProtocol", "()Ljava/lang/String;");
 g_SSLEngineGetHandshakeStatus = GetMethod(env, false, g_SSLEngine, "getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
 g_SSLEngineGetSession = GetMethod(env, false, g_SSLEngine, "getSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetHandshakeSession = GetOptionalMethod(env, false, g_SSLEngine, "getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetSSLParameters = GetMethod(env, false, g_SSLEngine, "getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
 g_SSLEngineGetSupportedProtocols = GetMethod(env, false, g_SSLEngine, "getSupportedProtocols", "()[Ljava/lang/String;");
 g_SSLEngineSetEnabledProtocols = GetMethod(env, false, g_SSLEngine, "setEnabledProtocols", "([Ljava/lang/String;)V");
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -415,6 +415,7 @@ extern jmethodID g_SSLEngineBeginHandshake;
extern jmethodID g_SSLEngineCloseOutbound;
extern jmethodID g_SSLEngineGetApplicationProtocol;
extern jmethodID g_SSLEngineGetHandshakeStatus;
extern jmethodID g_SSLEngineGetHandshakeSession;
extern jmethodID g_SSLEngineGetSession;
extern jmethodID g_SSLEngineGetSSLParameters;
extern jmethodID g_SSLEngineGetSupportedProtocols;
Expand Down

61 changes: 47 additions & 14 deletions
src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,27 @@ static bool IsHandshaking(int handshakeStatus)
 return handshakeStatus != HANDSHAKE_STATUS__NOT_HANDSHAKING && handshakeStatus != HANDSHAKE_STATUS__FINISHED;
}

static jobject GetSslSessionForHandshakeStatus(JNIEnv* env, SSLStream* sslStream, int handshakeStatus)
{
 // SSLEngine.getHandshakeSession() is available since API 24
 jobject sslSession = IsHandshaking(handshakeStatus) && g_SSLEngineGetHandshakeSession != NULL
 ? (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeSession)
 : (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetSession);
 if (CheckJNIExceptions(env))
 return NULL;

 return sslSession;
}

static jobject GetCurrentSslSession(JNIEnv* env, SSLStream* sslStream)
{
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (CheckJNIExceptions(env))
 return NULL;

 return GetSslSessionForHandshakeStatus(env, sslStream, handshakeStatus);
}

ARGS_NON_NULL_ALL static PAL_SSLStreamStatus Close(JNIEnv* env, SSLStream* sslStream)
{
 // Call wrap to clear any remaining data before closing
Expand DownExpand Up@@ -521,10 +542,13 @@ PAL_SSLStreamStatus AndroidCryptoNative_SSLStreamHandshake(SSLStream* sslStream)
 abort_if_invalid_pointer_argument (sslStream);
 JNIEnv* env = GetJNIEnv();

 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (!IsHandshaking(handshakeStatus)) {
 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 }

 return DoHandshake(env, sslStream);
}
Expand DownExpand Up@@ -703,14 +727,16 @@ int32_t AndroidCryptoNative_SSLStreamGetCipherSuite(SSLStream* sslStream, uint16
 *out = NULL;

 // String cipherSuite = sslSession.getCipherSuite();
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetCipherSuite);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetCipherSuite);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, cipherSuite);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, cipherSuite);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, cipherSuite);
 return ret;
}

Expand All@@ -724,14 +750,16 @@ int32_t AndroidCryptoNative_SSLStreamGetProtocol(SSLStream* sslStream, uint16_t*
 *out = NULL;

 // String protocol = sslSession.getProtocol();
 jstring protocol = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetProtocol);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring protocol = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetProtocol);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, protocol);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, protocol);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, protocol);
 return ret;
}

Expand All@@ -744,7 +772,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS

 // Certificate[] certs = sslSession.getPeerCertificates();
 // out = certs[0];
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null to indicate no certificate.
 if (TryClearJNIExceptions(env))
Expand All@@ -759,7 +788,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
 return ret;
}

Expand All@@ -777,7 +807,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 // for (int i = 0; i < certs.length; i++) {
 // out[i] = certs[i];
 // }
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null and length of zero to indicate no certificates.
 if (TryClearJNIExceptions(env))
Expand All@@ -796,7 +827,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
}

void AndroidCryptoNative_SSLStreamRequestClientAuthentication(SSLStream* sslStream)
Expand DownExpand Up@@ -910,14 +942,15 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, name, verifier);
 INIT_LOCALS(loc, name, verifier, sslSession);

 // HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
 // return verifier.verify(hostname, sslSession);
 loc[name] = make_java_string(env, hostname);
 loc[sslSession] = GetCurrentSslSession(env, sslStream);
 loc[verifier] =
 (*env)->CallStaticObjectMethod(env, g_HttpsURLConnection, g_HttpsURLConnectionGetDefaultHostnameVerifier);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], sslStream->sslSession);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], loc[sslSession]);

 RELEASE_LOCALS(loc, env);
 return ret;
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" + '
[release/6.0] [Android] Remove repeated calls to beginHandshake by github-actions[bot] · Pull Request #79039 · dotnet/runtime · GitHub
Skip to content
[release/6.0] [Android] Remove repeated calls to beginHandshake#79039

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

 Closed

github-actions
wants to merge
1
commit into

from

 Closed


[release/6.0] [Android] Remove repeated calls to beginHandshake
#79039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -401,6 +401,7 @@ jmethodID g_SSLEngineBeginHandshake;
jmethodID g_SSLEngineCloseOutbound;
jmethodID g_SSLEngineGetApplicationProtocol;
jmethodID g_SSLEngineGetHandshakeStatus;
jmethodID g_SSLEngineGetHandshakeSession;
jmethodID g_SSLEngineGetSession;
jmethodID g_SSLEngineGetSSLParameters;
jmethodID g_SSLEngineGetSupportedProtocols;
Expand DownExpand Up@@ -970,6 +971,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLEngineGetApplicationProtocol = GetOptionalMethod(env, false, g_SSLEngine, "getApplicationProtocol", "()Ljava/lang/String;");
 g_SSLEngineGetHandshakeStatus = GetMethod(env, false, g_SSLEngine, "getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
 g_SSLEngineGetSession = GetMethod(env, false, g_SSLEngine, "getSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetHandshakeSession = GetOptionalMethod(env, false, g_SSLEngine, "getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetSSLParameters = GetMethod(env, false, g_SSLEngine, "getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
 g_SSLEngineGetSupportedProtocols = GetMethod(env, false, g_SSLEngine, "getSupportedProtocols", "()[Ljava/lang/String;");
 g_SSLEngineSetEnabledProtocols = GetMethod(env, false, g_SSLEngine, "setEnabledProtocols", "([Ljava/lang/String;)V");
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -415,6 +415,7 @@ extern jmethodID g_SSLEngineBeginHandshake;
extern jmethodID g_SSLEngineCloseOutbound;
extern jmethodID g_SSLEngineGetApplicationProtocol;
extern jmethodID g_SSLEngineGetHandshakeStatus;
extern jmethodID g_SSLEngineGetHandshakeSession;
extern jmethodID g_SSLEngineGetSession;
extern jmethodID g_SSLEngineGetSSLParameters;
extern jmethodID g_SSLEngineGetSupportedProtocols;
Expand Down

61 changes: 47 additions & 14 deletions
src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,27 @@ static bool IsHandshaking(int handshakeStatus)
 return handshakeStatus != HANDSHAKE_STATUS__NOT_HANDSHAKING && handshakeStatus != HANDSHAKE_STATUS__FINISHED;
}

static jobject GetSslSessionForHandshakeStatus(JNIEnv* env, SSLStream* sslStream, int handshakeStatus)
{
 // SSLEngine.getHandshakeSession() is available since API 24
 jobject sslSession = IsHandshaking(handshakeStatus) && g_SSLEngineGetHandshakeSession != NULL
 ? (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeSession)
 : (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetSession);
 if (CheckJNIExceptions(env))
 return NULL;

 return sslSession;
}

static jobject GetCurrentSslSession(JNIEnv* env, SSLStream* sslStream)
{
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (CheckJNIExceptions(env))
 return NULL;

 return GetSslSessionForHandshakeStatus(env, sslStream, handshakeStatus);
}

ARGS_NON_NULL_ALL static PAL_SSLStreamStatus Close(JNIEnv* env, SSLStream* sslStream)
{
 // Call wrap to clear any remaining data before closing
Expand DownExpand Up@@ -521,10 +542,13 @@ PAL_SSLStreamStatus AndroidCryptoNative_SSLStreamHandshake(SSLStream* sslStream)
 abort_if_invalid_pointer_argument (sslStream);
 JNIEnv* env = GetJNIEnv();

 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (!IsHandshaking(handshakeStatus)) {
 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 }

 return DoHandshake(env, sslStream);
}
Expand DownExpand Up@@ -703,14 +727,16 @@ int32_t AndroidCryptoNative_SSLStreamGetCipherSuite(SSLStream* sslStream, uint16
 *out = NULL;

 // String cipherSuite = sslSession.getCipherSuite();
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetCipherSuite);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetCipherSuite);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, cipherSuite);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, cipherSuite);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, cipherSuite);
 return ret;
}

Expand All@@ -724,14 +750,16 @@ int32_t AndroidCryptoNative_SSLStreamGetProtocol(SSLStream* sslStream, uint16_t*
 *out = NULL;

 // String protocol = sslSession.getProtocol();
 jstring protocol = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetProtocol);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring protocol = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetProtocol);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, protocol);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, protocol);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, protocol);
 return ret;
}

Expand All@@ -744,7 +772,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS

 // Certificate[] certs = sslSession.getPeerCertificates();
 // out = certs[0];
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null to indicate no certificate.
 if (TryClearJNIExceptions(env))
Expand All@@ -759,7 +788,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
 return ret;
}

Expand All@@ -777,7 +807,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 // for (int i = 0; i < certs.length; i++) {
 // out[i] = certs[i];
 // }
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null and length of zero to indicate no certificates.
 if (TryClearJNIExceptions(env))
Expand All@@ -796,7 +827,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
}

void AndroidCryptoNative_SSLStreamRequestClientAuthentication(SSLStream* sslStream)
Expand DownExpand Up@@ -910,14 +942,15 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, name, verifier);
 INIT_LOCALS(loc, name, verifier, sslSession);

 // HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
 // return verifier.verify(hostname, sslSession);
 loc[name] = make_java_string(env, hostname);
 loc[sslSession] = GetCurrentSslSession(env, sslStream);
 loc[verifier] =
 (*env)->CallStaticObjectMethod(env, g_HttpsURLConnection, g_HttpsURLConnectionGetDefaultHostnameVerifier);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], sslStream->sslSession);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], loc[sslSession]);

 RELEASE_LOCALS(loc, env);
 return ret;
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('^' + ".*" + '
[release/6.0] [Android] Remove repeated calls to beginHandshake by github-actions[bot] · Pull Request #79039 · dotnet/runtime · GitHub
Skip to content
[release/6.0] [Android] Remove repeated calls to beginHandshake#79039

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

 Closed

github-actions
wants to merge
1
commit into

from

 Closed


[release/6.0] [Android] Remove repeated calls to beginHandshake
#79039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -401,6 +401,7 @@ jmethodID g_SSLEngineBeginHandshake;
jmethodID g_SSLEngineCloseOutbound;
jmethodID g_SSLEngineGetApplicationProtocol;
jmethodID g_SSLEngineGetHandshakeStatus;
jmethodID g_SSLEngineGetHandshakeSession;
jmethodID g_SSLEngineGetSession;
jmethodID g_SSLEngineGetSSLParameters;
jmethodID g_SSLEngineGetSupportedProtocols;
Expand DownExpand Up@@ -970,6 +971,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLEngineGetApplicationProtocol = GetOptionalMethod(env, false, g_SSLEngine, "getApplicationProtocol", "()Ljava/lang/String;");
 g_SSLEngineGetHandshakeStatus = GetMethod(env, false, g_SSLEngine, "getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
 g_SSLEngineGetSession = GetMethod(env, false, g_SSLEngine, "getSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetHandshakeSession = GetOptionalMethod(env, false, g_SSLEngine, "getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetSSLParameters = GetMethod(env, false, g_SSLEngine, "getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
 g_SSLEngineGetSupportedProtocols = GetMethod(env, false, g_SSLEngine, "getSupportedProtocols", "()[Ljava/lang/String;");
 g_SSLEngineSetEnabledProtocols = GetMethod(env, false, g_SSLEngine, "setEnabledProtocols", "([Ljava/lang/String;)V");
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -415,6 +415,7 @@ extern jmethodID g_SSLEngineBeginHandshake;
extern jmethodID g_SSLEngineCloseOutbound;
extern jmethodID g_SSLEngineGetApplicationProtocol;
extern jmethodID g_SSLEngineGetHandshakeStatus;
extern jmethodID g_SSLEngineGetHandshakeSession;
extern jmethodID g_SSLEngineGetSession;
extern jmethodID g_SSLEngineGetSSLParameters;
extern jmethodID g_SSLEngineGetSupportedProtocols;
Expand Down

61 changes: 47 additions & 14 deletions
src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,27 @@ static bool IsHandshaking(int handshakeStatus)
 return handshakeStatus != HANDSHAKE_STATUS__NOT_HANDSHAKING && handshakeStatus != HANDSHAKE_STATUS__FINISHED;
}

static jobject GetSslSessionForHandshakeStatus(JNIEnv* env, SSLStream* sslStream, int handshakeStatus)
{
 // SSLEngine.getHandshakeSession() is available since API 24
 jobject sslSession = IsHandshaking(handshakeStatus) && g_SSLEngineGetHandshakeSession != NULL
 ? (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeSession)
 : (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetSession);
 if (CheckJNIExceptions(env))
 return NULL;

 return sslSession;
}

static jobject GetCurrentSslSession(JNIEnv* env, SSLStream* sslStream)
{
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (CheckJNIExceptions(env))
 return NULL;

 return GetSslSessionForHandshakeStatus(env, sslStream, handshakeStatus);
}

ARGS_NON_NULL_ALL static PAL_SSLStreamStatus Close(JNIEnv* env, SSLStream* sslStream)
{
 // Call wrap to clear any remaining data before closing
Expand DownExpand Up@@ -521,10 +542,13 @@ PAL_SSLStreamStatus AndroidCryptoNative_SSLStreamHandshake(SSLStream* sslStream)
 abort_if_invalid_pointer_argument (sslStream);
 JNIEnv* env = GetJNIEnv();

 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (!IsHandshaking(handshakeStatus)) {
 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 }

 return DoHandshake(env, sslStream);
}
Expand DownExpand Up@@ -703,14 +727,16 @@ int32_t AndroidCryptoNative_SSLStreamGetCipherSuite(SSLStream* sslStream, uint16
 *out = NULL;

 // String cipherSuite = sslSession.getCipherSuite();
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetCipherSuite);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetCipherSuite);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, cipherSuite);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, cipherSuite);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, cipherSuite);
 return ret;
}

Expand All@@ -724,14 +750,16 @@ int32_t AndroidCryptoNative_SSLStreamGetProtocol(SSLStream* sslStream, uint16_t*
 *out = NULL;

 // String protocol = sslSession.getProtocol();
 jstring protocol = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetProtocol);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring protocol = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetProtocol);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, protocol);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, protocol);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, protocol);
 return ret;
}

Expand All@@ -744,7 +772,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS

 // Certificate[] certs = sslSession.getPeerCertificates();
 // out = certs[0];
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null to indicate no certificate.
 if (TryClearJNIExceptions(env))
Expand All@@ -759,7 +788,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
 return ret;
}

Expand All@@ -777,7 +807,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 // for (int i = 0; i < certs.length; i++) {
 // out[i] = certs[i];
 // }
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null and length of zero to indicate no certificates.
 if (TryClearJNIExceptions(env))
Expand All@@ -796,7 +827,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
}

void AndroidCryptoNative_SSLStreamRequestClientAuthentication(SSLStream* sslStream)
Expand DownExpand Up@@ -910,14 +942,15 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, name, verifier);
 INIT_LOCALS(loc, name, verifier, sslSession);

 // HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
 // return verifier.verify(hostname, sslSession);
 loc[name] = make_java_string(env, hostname);
 loc[sslSession] = GetCurrentSslSession(env, sslStream);
 loc[verifier] =
 (*env)->CallStaticObjectMethod(env, g_HttpsURLConnection, g_HttpsURLConnectionGetDefaultHostnameVerifier);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], sslStream->sslSession);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], loc[sslSession]);

 RELEASE_LOCALS(loc, env);
 return ret;
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); }
})();
})();
[release/6.0] [Android] Remove repeated calls to beginHandshake by github-actions[bot] · Pull Request #79039 · dotnet/runtime · GitHub
Skip to content
[release/6.0] [Android] Remove repeated calls to beginHandshake#79039

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

 Closed

github-actions
wants to merge
1
commit into

from

 Closed


[release/6.0] [Android] Remove repeated calls to beginHandshake
#79039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -401,6 +401,7 @@ jmethodID g_SSLEngineBeginHandshake;
jmethodID g_SSLEngineCloseOutbound;
jmethodID g_SSLEngineGetApplicationProtocol;
jmethodID g_SSLEngineGetHandshakeStatus;
jmethodID g_SSLEngineGetHandshakeSession;
jmethodID g_SSLEngineGetSession;
jmethodID g_SSLEngineGetSSLParameters;
jmethodID g_SSLEngineGetSupportedProtocols;
Expand DownExpand Up@@ -970,6 +971,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 g_SSLEngineGetApplicationProtocol = GetOptionalMethod(env, false, g_SSLEngine, "getApplicationProtocol", "()Ljava/lang/String;");
 g_SSLEngineGetHandshakeStatus = GetMethod(env, false, g_SSLEngine, "getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
 g_SSLEngineGetSession = GetMethod(env, false, g_SSLEngine, "getSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetHandshakeSession = GetOptionalMethod(env, false, g_SSLEngine, "getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
 g_SSLEngineGetSSLParameters = GetMethod(env, false, g_SSLEngine, "getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
 g_SSLEngineGetSupportedProtocols = GetMethod(env, false, g_SSLEngine, "getSupportedProtocols", "()[Ljava/lang/String;");
 g_SSLEngineSetEnabledProtocols = GetMethod(env, false, g_SSLEngine, "setEnabledProtocols", "([Ljava/lang/String;)V");
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -415,6 +415,7 @@ extern jmethodID g_SSLEngineBeginHandshake;
extern jmethodID g_SSLEngineCloseOutbound;
extern jmethodID g_SSLEngineGetApplicationProtocol;
extern jmethodID g_SSLEngineGetHandshakeStatus;
extern jmethodID g_SSLEngineGetHandshakeSession;
extern jmethodID g_SSLEngineGetSession;
extern jmethodID g_SSLEngineGetSSLParameters;
extern jmethodID g_SSLEngineGetSupportedProtocols;
Expand Down

61 changes: 47 additions & 14 deletions
src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,27 @@ static bool IsHandshaking(int handshakeStatus)
 return handshakeStatus != HANDSHAKE_STATUS__NOT_HANDSHAKING && handshakeStatus != HANDSHAKE_STATUS__FINISHED;
}

static jobject GetSslSessionForHandshakeStatus(JNIEnv* env, SSLStream* sslStream, int handshakeStatus)
{
 // SSLEngine.getHandshakeSession() is available since API 24
 jobject sslSession = IsHandshaking(handshakeStatus) && g_SSLEngineGetHandshakeSession != NULL
 ? (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeSession)
 : (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetSession);
 if (CheckJNIExceptions(env))
 return NULL;

 return sslSession;
}

static jobject GetCurrentSslSession(JNIEnv* env, SSLStream* sslStream)
{
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (CheckJNIExceptions(env))
 return NULL;

 return GetSslSessionForHandshakeStatus(env, sslStream, handshakeStatus);
}

ARGS_NON_NULL_ALL static PAL_SSLStreamStatus Close(JNIEnv* env, SSLStream* sslStream)
{
 // Call wrap to clear any remaining data before closing
Expand DownExpand Up@@ -521,10 +542,13 @@ PAL_SSLStreamStatus AndroidCryptoNative_SSLStreamHandshake(SSLStream* sslStream)
 abort_if_invalid_pointer_argument (sslStream);
 JNIEnv* env = GetJNIEnv();

 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 int handshakeStatus = GetEnumAsInt(env, (*env)->CallObjectMethod(env, sslStream->sslEngine, g_SSLEngineGetHandshakeStatus));
 if (!IsHandshaking(handshakeStatus)) {
 // sslEngine.beginHandshake();
 (*env)->CallVoidMethod(env, sslStream->sslEngine, g_SSLEngineBeginHandshake);
 if (CheckJNIExceptions(env))
 return SSLStreamStatus_Error;
 }

 return DoHandshake(env, sslStream);
}
Expand DownExpand Up@@ -703,14 +727,16 @@ int32_t AndroidCryptoNative_SSLStreamGetCipherSuite(SSLStream* sslStream, uint16
 *out = NULL;

 // String cipherSuite = sslSession.getCipherSuite();
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetCipherSuite);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring cipherSuite = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetCipherSuite);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, cipherSuite);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, cipherSuite);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, cipherSuite);
 return ret;
}

Expand All@@ -724,14 +750,16 @@ int32_t AndroidCryptoNative_SSLStreamGetProtocol(SSLStream* sslStream, uint16_t*
 *out = NULL;

 // String protocol = sslSession.getProtocol();
 jstring protocol = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetProtocol);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jstring protocol = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetProtocol);
 ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
 *out = AllocateString(env, protocol);

 ret = SUCCESS;

cleanup:
 (*env)->DeleteLocalRef(env, protocol);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, protocol);
 return ret;
}

Expand All@@ -744,7 +772,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS

 // Certificate[] certs = sslSession.getPeerCertificates();
 // out = certs[0];
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null to indicate no certificate.
 if (TryClearJNIExceptions(env))
Expand All@@ -759,7 +788,8 @@ jobject /*X509Certificate*/ AndroidCryptoNative_SSLStreamGetPeerCertificate(SSLS
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
 return ret;
}

Expand All@@ -777,7 +807,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 // for (int i = 0; i < certs.length; i++) {
 // out[i] = certs[i];
 // }
 jobjectArray certs = (*env)->CallObjectMethod(env, sslStream->sslSession, g_SSLSessionGetPeerCertificates);
 jobject sslSession = GetCurrentSslSession(env, sslStream);
 jobjectArray certs = (*env)->CallObjectMethod(env, sslSession, g_SSLSessionGetPeerCertificates);

 // If there are no peer certificates, getPeerCertificates will throw. Return null and length of zero to indicate no certificates.
 if (TryClearJNIExceptions(env))
Expand All@@ -796,7 +827,8 @@ void AndroidCryptoNative_SSLStreamGetPeerCertificates(SSLStream* sslStream, jobj
 }

cleanup:
 (*env)->DeleteLocalRef(env, certs);
 ReleaseLRef(env, sslSession);
 ReleaseLRef(env, certs);
}

void AndroidCryptoNative_SSLStreamRequestClientAuthentication(SSLStream* sslStream)
Expand DownExpand Up@@ -910,14 +942,15 @@ bool AndroidCryptoNative_SSLStreamVerifyHostname(SSLStream* sslStream, char* hos
 JNIEnv* env = GetJNIEnv();

 bool ret = false;
 INIT_LOCALS(loc, name, verifier);
 INIT_LOCALS(loc, name, verifier, sslSession);

 // HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
 // return verifier.verify(hostname, sslSession);
 loc[name] = make_java_string(env, hostname);
 loc[sslSession] = GetCurrentSslSession(env, sslStream);
 loc[verifier] =
 (*env)->CallStaticObjectMethod(env, g_HttpsURLConnection, g_HttpsURLConnectionGetDefaultHostnameVerifier);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], sslStream->sslSession);
 ret = (*env)->CallBooleanMethod(env, loc[verifier], g_HostnameVerifierVerify, loc[name], loc[sslSession]);

 RELEASE_LOCALS(loc, env);
 return ret;
Expand Down