Skip to content

[Android] Fix X509Store cleanup #128629

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
May 29, 2026
+30 −22
Merged

[Android] Fix X509Store cleanup #128629

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
2fc7069
Fix Android X509Store private key entry leaks
simonrozsival May 27, 2026
4431e89
Fix Android trusted cert exception cleanup
simonrozsival May 27, 2026
80602d4
Address trusted cert cleanup feedback
simonrozsival May 27, 2026
b64e0b0
Avoid diverging from the original code too much
simonrozsival May 27, 2026
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
17 changes: 7 additions & 10 deletions ...y.Cryptography/src/System/Security/Cryptography/X509Certificates/AndroidCertificatePal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,17 +575,14 @@ public void AppendPrivateKeyInfo(StringBuilder sb)

public void Dispose()
{
if (_privateKey != null)
{
_privateKey.Dispose();
_privateKey = null;
}
_privateKey?.Dispose();
_privateKey = null;

if (_cert != null)
{
_cert.Dispose();
_cert = null!;
}
_keyStorePrivateKeyEntry?.Dispose();
Comment thread
vcsjones marked this conversation as resolved.
_keyStorePrivateKeyEntry = null;

_cert?.Dispose();
_cert = null!;
}
Comment thread
simonrozsival marked this conversation as resolved.

public byte[] Export(X509ContentType contentType, SafePasswordHandle password)
Expand Down
35 changes: 23 additions & 12 deletions src/native/libs/System.Security.Cryptography.Native.Android/pal_x509store.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ EnumerateCertificates(JNIEnv* env, jobject /*KeyStore*/ store, EnumCertificatesC
// }
// }
jboolean hasNext = (*env)->CallBooleanMethod(env, aliases, g_EnumerationHasMoreElements);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
while (hasNext)
{
INIT_LOCALS(loc, alias, entry, cert, publicKey, privateKey);
Expand Down Expand Up @@ -311,6 +312,7 @@ EnumerateCertificates(JNIEnv* env, jobject /*KeyStore*/ store, EnumCertificatesC
RELEASE_LOCALS(loc, env);

hasNext = (*env)->CallBooleanMethod(env, aliases, g_EnumerationHasMoreElements);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
}

ret = SUCCESS;
Expand Down Expand Up @@ -365,31 +367,34 @@ ARGS_NON_NULL_ALL static int32_t EnumerateTrustedCertificates(
// }
// }
jboolean hasNext = (*env)->CallBooleanMethod(env, aliases, g_EnumerationHasMoreElements);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
while (hasNext)
{
jobject cert = NULL;
jstring alias = (*env)->CallObjectMethod(env, aliases, g_EnumerationNextElement);
ON_EXCEPTION_PRINT_AND_GOTO(loop_cleanup);

if (filter == NULL || filter(env, alias))
{
jobject cert = (*env)->CallObjectMethod(env, store, g_KeyStoreGetCertificate, alias);
if (cert != NULL && !CheckJNIExceptions(env))
cert = (*env)->CallObjectMethod(env, store, g_KeyStoreGetCertificate, alias);
if (!CheckJNIExceptions(env) && cert != NULL)
{
cert = ToGRef(env, cert);
cb(cert, context);
cb(AddGRef(env, cert), context);
}
}

hasNext = (*env)->CallBooleanMethod(env, aliases, g_EnumerationHasMoreElements);

loop_cleanup:
(*env)->DeleteLocalRef(env, alias);
ReleaseLRef(env, cert);
ReleaseLRef(env, alias);

hasNext = (*env)->CallBooleanMethod(env, aliases, g_EnumerationHasMoreElements);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
}

ret = SUCCESS;

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

Expand Down Expand Up @@ -431,9 +436,11 @@ jobject /*KeyStore*/ AndroidCryptoNative_X509StoreOpenDefault(void)
(*env)->CallVoidMethod(env, store, g_KeyStoreLoad, NULL, NULL);
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
ret = ToGRef(env, store);
store = NULL;

cleanup:
(*env)->DeleteLocalRef(env, storeType);
ReleaseLRef(env, store);
ReleaseLRef(env, storeType);
return ret;
}

Expand All @@ -444,19 +451,23 @@ int32_t AndroidCryptoNative_X509StoreRemoveCertificate(jobject /*KeyStore*/ stor
abort_if_invalid_pointer_argument (store);

JNIEnv* env = GetJNIEnv();
int32_t ret = FAIL;

jstring alias = make_java_string(env, hashString);
if (!ContainsMatchingCertificateForAlias(env, store, cert, alias))
{
// Certificate is not in store - nothing to do
return SUCCESS;
ret = SUCCESS;
goto cleanup;
}

// store.deleteEntry(alias);
(*env)->CallVoidMethod(env, store, g_KeyStoreDeleteEntry, alias);
ret = CheckJNIExceptions(env) ? FAIL : SUCCESS;

(*env)->DeleteLocalRef(env, alias);
return CheckJNIExceptions(env) ? FAIL : SUCCESS;
cleanup:
ReleaseLRef(env, alias);
return ret;
}

jobject AndroidCryptoNative_X509StoreGetPrivateKeyEntry(jobject /*KeyStore*/ store, const char* hashString)
Expand Down
Loading