mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-19 19:42:29 +02:00
Code

Add OpenSSL version in about screen

Browse Source
This commit is contained in:
Arne Schwabe 2022-11-01 18:35:16 +01:00
parent c71db5fc5a
commit ea13917b41
6 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/cpp/CMakeLists.txt
View File

@ -109,8 +109,8 @@ target_compile_definitions(ovpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\"
)
target_link_libraries(ovpnutil log)
add_library(rsapss SHARED ovpnutil/rsapss.cpp)
target_link_libraries(rsapss log crypto ssl)
add_library(osslutil SHARED ovpnutil/osslutil.cpp)
target_link_libraries(osslutil log crypto ssl)
if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
add_library(osslspeedtest SHARED ovpnutil/sslspeed.c)

3
main/src/main/cpp/ovpnutil/jniglue.c
View File

@ -3,7 +3,6 @@
#include <stdlib.h>
#include <unistd.h>
#include "jniglue.h"
jint JNI_OnLoad(JavaVM *vm, void *reserved) {
@ -37,4 +36,4 @@ jstring Java_de_blinkt_openvpn_core_NativeUtils_getOpenVPN3GitVersion(JNIEnv *en
{
return (*env)->NewStringUTF(env, OPENVPN3_GIT_REVISION);
}
}

7
main/src/main/cpp/ovpnutil/rsapss.cpp → main/src/main/cpp/ovpnutil/osslutil.cpp
View File

@ -13,9 +13,16 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/opensslv.h>
#include <array>
extern "C" jstring Java_de_blinkt_openvpn_core_NativeUtils_getOpenSSLVersionString(JNIEnv *env, jclass jo)
{
return env->NewStringUTF(OPENSSL_VERSION_TEXT);
}
static const unsigned char zeroes[] = {0, 0, 0, 0, 0, 0, 0, 0};
static char opensslerr[1024];

22
main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
View File

@ -30,18 +30,28 @@ public class NativeUtils {
public static native String getOpenVPN3GitVersion();
static boolean rsspssloaded = false;
private static native String getOpenSSLVersionString();
public static String getOpenSSLVersion() {
loadOsslUtil();
return getOpenSSLVersionString();
}
static boolean osslutilloaded = false;
public static byte[] addRssPssPadding(int hashtype, int MSBits, int rsa_size, byte[] from)
{
if (!rsspssloaded) {
rsspssloaded = true;
System.loadLibrary("rsapss");
}
loadOsslUtil();
return rsapss(hashtype, MSBits, rsa_size, from);
}
private static void loadOsslUtil() {
if (!osslutilloaded) {
osslutilloaded = true;
System.loadLibrary("osslutil");
}
}
private static native byte[] rsapss(int hashtype, int MSBits, int rsa_size, byte[] from);
public final static int[] openSSLlengths = {

4
main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java
View File

@ -83,9 +83,13 @@ public class AboutFragment extends Fragment implements View.OnClickListener {
TextView verO2 = v.findViewById(R.id.version_ovpn2);
TextView verO3 = v.findViewById(R.id.version_ovpn3);
TextView osslVer = v.findViewById(R.id.openssl_version);
verO2.setText(String.format(Locale.US, "OpenVPN version: %s", NativeUtils.getOpenVPN2GitVersion()));
verO3.setText(String.format(Locale.US, "OpenVPN3 core version: %s", NativeUtils.getOpenVPN3GitVersion()));
osslVer.setText(String.format(Locale.US, "OpenSSL version: %s", NativeUtils.getOpenSSLVersion()));
/* recreating view without onCreate/onDestroy cycle */
TextView translation = (TextView) v.findViewById(R.id.translation);

8
main/src/ui/res/layout/about.xml
View File

@ -45,9 +45,13 @@
android:id="@+id/version_ovpn3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12sp"
tools:text="OpenVPN3 core version 8df8718283" />
<TextView
android:id="@+id/openssl_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12sp"
tools:text="OpenSSL version 8df8718283" />
<TextView
android:layout_width="match_parent"