Skip to content

Revert "Use fast natives in Conscrypt. (#1339)" #1351

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
miguelaranda0 merged 1 commit into from
Jun 30, 2025
Merged

Revert "Use fast natives in Conscrypt. (#1339)" #1351

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
30 changes: 0 additions & 30 deletions android-stub/src/main/java/dalvik/annotation/optimization/CriticalNative.java
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions android-stub/src/main/java/dalvik/annotation/optimization/FastNative.java
View file
Open in desktop

This file was deleted.

15 changes: 8 additions & 7 deletions common/src/jni/main/cpp/conscrypt/native_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@
#include <type_traits>
#include <vector>

#include "jni.h"

using conscrypt::AppData;
using conscrypt::BioInputStream;
using conscrypt::BioOutputStream;
Expand Down Expand Up @@ -3066,7 +3064,8 @@ static void NativeCrypto_EVP_MD_CTX_cleanup(JNIEnv* env, jclass, jobject ctxRef)
}
}

static void NativeCrypto_EVP_MD_CTX_destroy(CRITICAL_JNI_PARAMS_COMMA jlong ctxRef) {
static void NativeCrypto_EVP_MD_CTX_destroy(JNIEnv* env, jclass, jlong ctxRef) {
CHECK_ERROR_QUEUE_ON_RETURN;
EVP_MD_CTX* ctx = reinterpret_cast<EVP_MD_CTX*>(ctxRef);
JNI_TRACE_MD("EVP_MD_CTX_destroy(%p)", ctx);

Expand Down Expand Up @@ -8214,7 +8213,8 @@ static SSL_SESSION* server_session_requested_callback(SSL* ssl, const uint8_t* i
return ssl_session_ptr;
}

static jint NativeCrypto_EVP_has_aes_hardware(CRITICAL_JNI_PARAMS) {
static jint NativeCrypto_EVP_has_aes_hardware(JNIEnv* env, jclass) {
CHECK_ERROR_QUEUE_ON_RETURN;
int ret = 0;
ret = EVP_has_aes_hardware();
JNI_TRACE("EVP_has_aes_hardware => %d", ret);
Expand Down Expand Up @@ -10459,8 +10459,9 @@ static jlong NativeCrypto_SSL_get_timeout(JNIEnv* env, jclass, jlong ssl_address
return result;
}

static jint NativeCrypto_SSL_get_signature_algorithm_key_type(
CRITICAL_JNI_PARAMS_COMMA jint signatureAlg) {
static jint NativeCrypto_SSL_get_signature_algorithm_key_type(JNIEnv* env, jclass,
jint signatureAlg) {
CHECK_ERROR_QUEUE_ON_RETURN;
return SSL_get_signature_algorithm_key_type(signatureAlg);
}

Expand Down Expand Up @@ -10933,7 +10934,7 @@ static jint NativeCrypto_SSL_get_error(JNIEnv* env, jclass, jlong ssl_address,
return SSL_get_error(ssl, ret);
}

static void NativeCrypto_SSL_clear_error(CRITICAL_JNI_PARAMS) {
static void NativeCrypto_SSL_clear_error(JNIEnv*, jclass) {
ERR_clear_error();
}

Expand Down
8 changes: 0 additions & 8 deletions common/src/jni/main/include/conscrypt/jniutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@
namespace conscrypt {
namespace jniutil {

#ifdef __ANDROID__
#define CRITICAL_JNI_PARAMS
#define CRITICAL_JNI_PARAMS_COMMA
#else
#define CRITICAL_JNI_PARAMS JNIEnv*, jclass
#define CRITICAL_JNI_PARAMS_COMMA JNIEnv*, jclass,
#endif

extern JavaVM* gJavaVM;
extern jclass cryptoUpcallsClass;
extern jclass openSslInputStreamClass;
Expand Down
Loading
Loading