PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Various improvements to native cipher so that it now actually destroys Java in terms of speed. Closes #871 - thanks @ninja-

Browse Source
This commit is contained in:
md_5
2014-02-12 17:36:58 +11:00
parent b3627652f2
commit 2e80bf30dd
5 changed files with 69 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
native/src/main/c/NativeCipherImpl.c
View File

@@ -3,54 +3,66 @@
#include <jni.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define BYTE unsigned char
jlong Java_net_md_15_bungee_NativeCipherImpl_init
jlong Java_net_md_15_bungee_NativeCipherImpl_initKey
(JNIEnv* env, jobject obj, jbyteArray key)
{
AES_KEY *aes_key = malloc(sizeof(AES_KEY));
jboolean isKeyCopy;
BYTE *key_bytes = (BYTE*)(*env)->GetByteArrayElements(env, key, &isKeyCopy);
jboolean isFieldCopy;
BYTE *key_bytes = (BYTE*)(*env)->GetByteArrayElements(env, key, &isFieldCopy);
int key_length = (*env)->GetArrayLength(env, key) * 8; // in bits
AES_set_encrypt_key(key_bytes, key_length, aes_key);
if (isKeyCopy) {
if (isFieldCopy) {
(*env)->ReleaseByteArrayElements(env, key, (jbyte*)key_bytes, JNI_ABORT);
}
return (long) aes_key;
}
jlong Java_net_md_15_bungee_NativeCipherImpl_initIV
(JNIEnv* env, jobject obj, jbyteArray iv)
{
jboolean isFieldCopy;
BYTE *iv_bytes = (BYTE*)(*env)->GetByteArrayElements(env, iv, &isFieldCopy);
int iv_length = (*env)->GetArrayLength(env, iv);
BYTE* jni_iv = malloc(iv_length);
memcpy(jni_iv, iv_bytes, iv_length);
if (isFieldCopy) {
(*env)->ReleaseByteArrayElements(env, iv, (jbyte*)iv_bytes, JNI_ABORT);
}
return (long) jni_iv;
}
void Java_net_md_15_bungee_NativeCipherImpl_free
(JNIEnv* env, jobject obj, jlong key)
(JNIEnv* env, jobject obj, jlong key, jlong iv)
{
free((AES_KEY*)key);
free((BYTE*)iv);
}
void Java_net_md_15_bungee_NativeCipherImpl_cipher
(JNIEnv* env, jobject obj, jboolean forEncryption, jlong key, jbyteArray iv, jlong in, jlong out, jint length)
(JNIEnv* env, jobject obj, jboolean forEncryption, jlong key, jlong iv, jlong in, jlong out, jint length)
{
AES_KEY *aes_key = (AES_KEY*)key;
size_t buffer_length = (size_t) length;
BYTE *input = (BYTE*) in;
BYTE *output = (BYTE*) out;
jboolean isCopy;
BYTE *iv_bytes = (BYTE*)(*env)->GetByteArrayElements(env, iv, &isCopy);
BYTE *input = (BYTE*) in;
BYTE *output = (BYTE*) out;
BYTE* jni_iv = (BYTE*) iv;
AES_cfb8_encrypt(
input, // input buffer
output, // output buffer
buffer_length, // readable bytes
aes_key, // encryption key
iv_bytes, // IV
jni_iv, // IV
NULL, // not needed
forEncryption ? AES_ENCRYPT : AES_DECRYPT // encryption mode
);
// IV has changed, let's copy it back
if (isCopy) {
(*env)->ReleaseByteArrayElements(env, iv, (jbyte*)iv_bytes, 0);
}
}

16
native/src/main/c/net_md_5_bungee_NativeCipherImpl.h
View File

@@ -9,10 +9,17 @@ extern "C" {
#endif
/*
* Class: net_md_5_bungee_NativeCipherImpl
* Method: init
* Method: init_key
* Signature: ([B)J
*/
JNIEXPORT jlong JNICALL Java_net_md_15_bungee_NativeCipherImpl_init
JNIEXPORT jlong JNICALL Java_net_md_15_bungee_NativeCipherImpl_initKey
(JNIEnv *, jobject, jbyteArray);
/*
* Class: net_md_5_bungee_NativeCipherImpl
* Method: init_iv
* Signature: ([B)J
*/
JNIEXPORT jlong JNICALL Java_net_md_15_bungee_NativeCipherImpl_initIV
(JNIEnv *, jobject, jbyteArray);
/*
@@ -21,7 +28,7 @@ JNIEXPORT jlong JNICALL Java_net_md_15_bungee_NativeCipherImpl_init
* Signature: (J)V
*/
JNIEXPORT void JNICALL Java_net_md_15_bungee_NativeCipherImpl_free
(JNIEnv *, jobject, jlong);
(JNIEnv *, jobject, jlong, jlong);
/*
* Class: net_md_5_bungee_NativeCipherImpl
@@ -29,9 +36,10 @@ JNIEXPORT void JNICALL Java_net_md_15_bungee_NativeCipherImpl_free
* Signature: (ZJ[BJJI)V
*/
JNIEXPORT void JNICALL Java_net_md_15_bungee_NativeCipherImpl_cipher
(JNIEnv *, jobject, jboolean, jlong, jbyteArray, jlong, jlong, jint);
(JNIEnv *, jobject, jboolean, jlong, jlong, jlong, jlong, jint);
#ifdef __cplusplus
}
#endif
#endif