diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2017-06-23 15:05:50 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2017-06-23 15:05:50 +0200 |
| commit | 016ffa320a620935f124f829a92de8a1b1e566cb (patch) | |
| tree | bd0576919421d116a504622d4f6faf0334e7b668 | |
| parent | f4f061955d2ba4843d699d205f28c7ef64b1e20e (diff) | |
Hack o rame to let jbcrypto hack work also with OpenSSL 1.1
| -rw-r--r-- | main/jni/Android.mk | 2 | ||||
| -rw-r--r-- | main/jni/jbcrypto.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk index 75c05bdc..ec88cb8e 100644 --- a/main/jni/Android.mk +++ b/main/jni/Android.mk @@ -60,7 +60,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDLIBS := -llog -lz LOCAL_CFLAGS = -LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl +LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl openssl/crypto/include LOCAL_SRC_FILES:= jbcrypto.cpp LOCAL_MODULE = jbcrypto LOCAL_SHARED_LIBRARIES := libcrypto diff --git a/main/jni/jbcrypto.cpp b/main/jni/jbcrypto.cpp index 2fd1262a..810a3bc7 100644 --- a/main/jni/jbcrypto.cpp +++ b/main/jni/jbcrypto.cpp @@ -8,6 +8,8 @@ #include <jni.h> + +#include <internal/cryptlib.h> #include <openssl/ssl.h> #include <openssl/rsa.h> #include <openssl/objects.h> @@ -15,6 +17,7 @@ #include <android/log.h> #include <openssl/err.h> +#include <internal/evp_int.h> extern "C" { jbyteArray Java_de_blinkt_openvpn_core_NativeUtils_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef); |