Skip to content
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

Jump to bottom

Modify JNI names to make them compatible with Java-only projects #100

Merged
merged 1 commit into from Aug 13, 2019
Merged

Modify JNI names to make them compatible with Java-only projects #100

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/jni.rs
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ pub extern "C" fn log_print(_log_string: *const c_char) {

/// Generates new x25519 secret key and converts into java byte array.
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_x25519_1secret_1key"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_x25519_1secret_1key"]
pub extern "C" fn generate_secret_key(env: JNIEnv, _class: JClass) -> jbyteArray {
match env.byte_array_from_slice(&x25519_secret_key().as_bytes()) {
Ok(v) => v,
Expand All @@ -45,7 +45,7 @@ pub extern "C" fn generate_secret_key(env: JNIEnv, _class: JClass) -> jbyteArray

/// Computes public x25519 key from secret key and converts into java byte array.
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_x25519_1public_1key"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_x25519_1public_1key"]
pub unsafe extern "C" fn generate_public_key1(
env: JNIEnv,
_class: JClass,
Expand Down Expand Up @@ -73,7 +73,7 @@ pub unsafe extern "C" fn generate_public_key1(

/// Converts x25519 key to hex string.
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_x25519_1key_1to_1hex"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_x25519_1key_1to_1hex"]
pub unsafe extern "C" fn convert_x25519_key_to_hex(
env: JNIEnv,
_class: JClass,
Expand All @@ -99,7 +99,7 @@ pub unsafe extern "C" fn convert_x25519_key_to_hex(

/// Converts x25519 key to base64 string.
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_x25519_1key_1to_1base64"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_x25519_1key_1to_1base64"]
pub unsafe extern "C" fn convert_x25519_key_to_base64(
env: JNIEnv,
_class: JClass,
Expand All @@ -126,7 +126,7 @@ pub unsafe extern "C" fn convert_x25519_key_to_base64(

/// Creates new tunnel
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_new_1tunnel"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_new_1tunnel"]
pub unsafe extern "C" fn create_new_tunnel(
env: JNIEnv,
_class: JClass,
Expand Down Expand Up @@ -154,7 +154,7 @@ pub unsafe extern "C" fn create_new_tunnel(

/// Encrypts raw IP packets into WG formatted packets.
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_wireguard_1write"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_wireguard_1write"]
pub unsafe extern "C" fn encrypt_raw_packet(
env: JNIEnv,
_class: JClass,
Expand Down Expand Up @@ -189,7 +189,7 @@ pub unsafe extern "C" fn encrypt_raw_packet(

/// Decrypts WG formatted packets into raw IP packets.
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_wireguard_1read"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_wireguard_1read"]
pub unsafe extern "C" fn decrypt_to_raw_packet(
env: JNIEnv,
_class: JClass,
Expand Down Expand Up @@ -225,7 +225,7 @@ pub unsafe extern "C" fn decrypt_to_raw_packet(

/// Periodic function that writes WG formatted packets into destination buffer
#[no_mangle]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_00024Companion_wireguard_1tick"]
#[export_name = "Java_com_cloudflare_app_boringtun_BoringTunJNI_wireguard_1tick"]
pub unsafe extern "C" fn run_periodic_task(
env: JNIEnv,
_class: JClass,
Expand Down