summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2023-10-11 12:31:10 +0200
committerArne Schwabe <arne@rfc2549.org>2023-10-12 11:58:06 +0200
commit055986820eaa59007173455d0787921898320491 (patch)
tree33c582e535135b2385334b94cc28a8074047be03 /main
parent87aac67b611f616aebfb722679b40e3f49576f01 (diff)
Update NDK version
Diffstat (limited to 'main')
-rw-r--r--main/build.gradle.kts3
-rw-r--r--main/src/main/cpp/ovpnutil/osslutil.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 7a7f2c6b..4706aa2f 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -21,7 +21,7 @@ android {
//compileSdkPreview = "UpsideDownCake"
// Also update runcoverity.sh
- ndkVersion = "25.2.9519653"
+ ndkVersion = "26.1.10909125"
defaultConfig {
minSdk = 21
@@ -31,6 +31,7 @@ android {
versionName = "0.7.49"
externalNativeBuild {
cmake {
+ //arguments+= "-DCMAKE_VERBOSE_MAKEFILE=1"
}
}
}
diff --git a/main/src/main/cpp/ovpnutil/osslutil.cpp b/main/src/main/cpp/ovpnutil/osslutil.cpp
index 6a33338e..1921223c 100644
--- a/main/src/main/cpp/ovpnutil/osslutil.cpp
+++ b/main/src/main/cpp/ovpnutil/osslutil.cpp
@@ -113,9 +113,12 @@ extern "C" jbyteArray Java_de_blinkt_openvpn_core_NativeUtils_rsapss(JNIEnv *env
if (!EVP_DigestFinal_ex(ctx, H, nullptr))
goto err;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
/* Generate dbMask in place then perform XOR on it */
if (PKCS1_MGF1(EM, maskedDBLen, H, hLen, mgf1Hash))
goto err;
+#pragma clang diagnostic pop
p = EM;