diff options
| author | Albin <albin@mullvad.net> | 2023-07-31 13:20:56 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-07-31 13:20:56 +0200 |
| commit | 1626b0ffbd45460c45dab7f1e37b096d49761aac (patch) | |
| tree | 3e6fd1deb5191a2f81c3ed0ad26afc3dca9c69d0 /android | |
| parent | f300cda8767f3e07b62471677c5ea729d8a0dff0 (diff) | |
| parent | 40734bc5a60ce4bd05c92e1d6151042a604c1832 (diff) | |
| download | mullvadvpn-1626b0ffbd45460c45dab7f1e37b096d49761aac.tar.xz mullvadvpn-1626b0ffbd45460c45dab7f1e37b096d49761aac.zip | |
Merge branch 'fix-android-lockfile'
Diffstat (limited to 'android')
| -rw-r--r-- | android/gradle/verification-metadata.xml | 15 | ||||
| -rw-r--r-- | android/test/test-suppression.xml | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index 51fdee1137..ee75266140 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -843,6 +843,11 @@ <sha256 value="01f17f2bc714167f2cc1e66ccf74cbced329fd5be884872c786be69616ca5aad" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.1"> + <artifact name="lifecycle-runtime-2.3.1.module"> + <sha256 value="2a7b90e5049b674b36bccfd68677b3a0b3178b3f7c2ef7ddf618d3895598c4ce" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.5.1"> <artifact name="lifecycle-runtime-2.5.1.aar"> <sha256 value="33b0d73dc2f028fceb3599bacabe563c3db6d26f3513d889595863536a4ac8c0" origin="Generated by Gradle"/> @@ -883,6 +888,11 @@ <sha256 value="feeb5ec453c20d8c1900b0849d2066edc8a41532ce0088d641c4a886bae57a08" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.1"> + <artifact name="lifecycle-viewmodel-2.3.1.module"> + <sha256 value="a531853dfe316c90b7466d24be94dbe60a60ef54a52c904c86381986202e51f4" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.5.1"> <artifact name="lifecycle-viewmodel-2.5.1.aar"> <sha256 value="14a27d5fb8a1436b1b7dec18bebaa66c830cdbbc8e28a81ce5f85b7c33b3ae9d" origin="Generated by Gradle"/> @@ -931,6 +941,11 @@ <sha256 value="aaebeb10e23b2ca35346e767aead804254a9889623873fc5cab2041dc931ad9c" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.1"> + <artifact name="lifecycle-viewmodel-savedstate-2.3.1.module"> + <sha256 value="8083710b758ac096891e91f51d91ee56a445b265d7becf230355377327c0418b" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.5.1"> <artifact name="lifecycle-viewmodel-savedstate-2.5.1.aar"> <sha256 value="8481141f97f0e6213dd33fcc89a784c4bd11a6ff7d4779a1cf6a0e9fbdbf24e0" origin="Generated by Gradle"/> diff --git a/android/test/test-suppression.xml b/android/test/test-suppression.xml index 526f89a2c5..720ef7d197 100644 --- a/android/test/test-suppression.xml +++ b/android/test/test-suppression.xml @@ -102,4 +102,12 @@ <packageUrl regex="true">^pkg:maven/com\.squareup\.okio/okio.*@.*$</packageUrl> <cve>CVE-2023-3635</cve> </suppress> + <suppress until="2023-12-01Z"> + <notes><![CDATA[ + This CVE only affect certain test cases so suppressing until patched. + https://nvd.nist.gov/vuln/detail/CVE-2023-3782 + ]]></notes> + <packageUrl regex="true">^pkg:maven/com\.squareup\.okhttp3/.*@.*$</packageUrl> + <cve>CVE-2023-3782</cve> + </suppress> </suppressions> |