PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Compatability and benchmark fixes for native code.

Browse Source
This commit is contained in:
md_5 2016-01-16 13:29:50 +11:00
parent 83e27f07e6
commit 7907610eeb
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/compile-native.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
CXX="g++ -std=c++11 -shared -fPIC -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/" CXX="g++ -shared -fPIC -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/"
$CXX src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so -lcrypto $CXX src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so -lcrypto
$CXX src/main/c/NativeCompressImpl.cpp -o src/main/resources/native-compress.so -lz $CXX src/main/c/NativeCompressImpl.cpp -o src/main/resources/native-compress.so -lz

6
native/src/main/java/net/md_5/bungee/jni/cipher/NativeCipher.java
View File

@ -44,6 +44,12 @@ public class NativeCipher implements BungeeCipher
// Store how many bytes we can cipher // Store how many bytes we can cipher
int length = in.readableBytes(); int length = in.readableBytes();
// Older OpenSSL versions will flip if length <= 0
if ( length <= 0 )
{
return;
}
// It is important to note that in AES CFB-8 mode, the number of read bytes, is the number of outputted bytes // It is important to note that in AES CFB-8 mode, the number of read bytes, is the number of outputted bytes
out.ensureWritable( length ); out.ensureWritable( length );

2
native/src/test/java/net/md_5/bungee/NativeCipherTest.java
View File

@ -124,6 +124,7 @@ public class NativeCipherTest
for ( int i = 0; i < BENCHMARK_COUNT; i++ ) for ( int i = 0; i < BENCHMARK_COUNT; i++ )
{ {
cipher.cipher( nativePlain, out ); cipher.cipher( nativePlain, out );
nativePlain.readerIndex( 0 );
out.clear(); out.clear();
} }
System.out.println( String.format( "Encryption Iteration: %d, Elapsed: %d ms", BENCHMARK_COUNT, System.currentTimeMillis() - start ) ); System.out.println( String.format( "Encryption Iteration: %d, Elapsed: %d ms", BENCHMARK_COUNT, System.currentTimeMillis() - start ) );
@ -134,6 +135,7 @@ public class NativeCipherTest
for ( int i = 0; i < BENCHMARK_COUNT; i++ ) for ( int i = 0; i < BENCHMARK_COUNT; i++ )
{ {
cipher.cipher( nativeCiphered, out ); cipher.cipher( nativeCiphered, out );
nativeCiphered.readerIndex( 0 );
out.clear(); out.clear();
} }
System.out.println( String.format( "Decryption Iteration: %d, Elapsed: %d ms", BENCHMARK_COUNT, System.currentTimeMillis() - start ) ); System.out.println( String.format( "Decryption Iteration: %d, Elapsed: %d ms", BENCHMARK_COUNT, System.currentTimeMillis() - start ) );