diff options
| -rw-r--r-- | main/build.gradle.kts | 3 | ||||
| -rw-r--r-- | main/src/main/cpp/ovpnutil/osslutil.cpp | 3 | ||||
| -rwxr-xr-x | runcoverity.sh | 2 |
3 files changed, 6 insertions, 2 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; diff --git a/runcoverity.sh b/runcoverity.sh index b716e548..988b5cda 100755 --- a/runcoverity.sh +++ b/runcoverity.sh @@ -14,7 +14,7 @@ cov-configure --config .coverity/cfg.xml --java ./gradlew -b build.gradle.kts --no-daemon clean cov-build --dir .coverity/idir --config .coverity/cfg.xml ./gradlew -b build.gradle.kts --no-daemon assembleUiOvpn23Release -NDK_VER=${NDK_VER:-25.2.9519653} +NDK_VER=${NDK_VER:-26.1.10909125} cov-analyze --dir .coverity/idir --all --strip-path ${PWD}/main/src/main/cpp --strip-path ${PWD}/main/src --strip-path ${PWD} --strip-path ${ANDROID_HOME}/ndk/${NDK_VER}/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/ --strip-path ${ANDROID_HOME}/ndk/${NDK_VER}/toolchains/llvm/prebuilt/linux-x86_64/sysroot cov-commit-defects --dir .coverity/idir --ssl -host ${COVERITY_CONNECT_HOST} --stream icsopenvpn-styx-master --auth-key-file ~/.coverity/auth-key.txt |