From dd4e83caeba0ea2ffa74d458bfcd29117eb89e48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 08:09:40 +0000 Subject: [PATCH 1/3] chore(deps): Bump awala from 1.64.0 to 1.65.0 Bumps [awala](https://github.com/relaycorp/awala-jvm) from 1.64.0 to 1.65.0. - [Release notes](https://github.com/relaycorp/awala-jvm/releases) - [Changelog](https://github.com/relaycorp/awala-jvm/blob/master/.releaserc.yml) - [Commits](https://github.com/relaycorp/awala-jvm/compare/v1.64.0...v1.65.0) --- updated-dependencies: - dependency-name: tech.relaycorp:awala dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index e733f111..c9d5a9ed 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -64,7 +64,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion" // Awala - implementation 'tech.relaycorp:awala:1.64.0' + implementation 'tech.relaycorp:awala:1.65.0' implementation 'tech.relaycorp:awala-keystore-file:1.6.0' implementation 'tech.relaycorp:poweb:1.5.24' testImplementation 'tech.relaycorp:awala-testing:1.5.0' From 7613da52eb7349933adfa7c891ea914ac4286148 Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Tue, 19 Apr 2022 15:35:28 +0100 Subject: [PATCH 2/3] fix --- .../relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt | 6 ++++-- .../tech/relaycorp/awaladroid/test/MockContextTestCase.kt | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt b/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt index 7e795f00..7d5f3707 100644 --- a/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt +++ b/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt @@ -203,8 +203,10 @@ internal constructor( val gatewayPrivateAddress = registration.gatewayCertificate.subjectPrivateAddress try { context.certificateStore.save( - registration.privateNodeCertificate, - listOf(registration.gatewayCertificate), + CertificationPath( + registration.privateNodeCertificate, + listOf(registration.gatewayCertificate), + ), gatewayPrivateAddress ) } catch (exc: KeyStoreBackendException) { diff --git a/lib/src/test/java/tech/relaycorp/awaladroid/test/MockContextTestCase.kt b/lib/src/test/java/tech/relaycorp/awaladroid/test/MockContextTestCase.kt index f6b16f14..f071d584 100644 --- a/lib/src/test/java/tech/relaycorp/awaladroid/test/MockContextTestCase.kt +++ b/lib/src/test/java/tech/relaycorp/awaladroid/test/MockContextTestCase.kt @@ -98,9 +98,11 @@ internal abstract class MockContextTestCase { val certificate = firstPartyEndpoint.identityCertificate certificateStore.save( - certificate, - firstPartyEndpoint.identityCertificateChain, - certificate.issuerCommonName + CertificationPath( + certificate, + firstPartyEndpoint.identityCertificateChain + ), + certificate.issuerCommonName, ) if (MockUtil.isMock(storage)) { From 464641e20029df56c5abf8c9e79d294c923ae1a5 Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Tue, 19 Apr 2022 15:51:59 +0100 Subject: [PATCH 3/3] fix take 2 --- .../relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt b/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt index 296da145..461f189a 100644 --- a/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt +++ b/lib/src/main/java/tech/relaycorp/awaladroid/endpoint/FirstPartyEndpoint.kt @@ -156,9 +156,11 @@ internal constructor( val gatewayPrivateAddress = registration.gatewayCertificate.subjectPrivateAddress try { context.certificateStore.save( - registration.privateNodeCertificate, - listOf(registration.gatewayCertificate), - gatewayPrivateAddress + CertificationPath( + registration.privateNodeCertificate, + listOf(registration.gatewayCertificate), + ), + gatewayPrivateAddress, ) } catch (exc: KeyStoreBackendException) { throw PersistenceException("Failed to save certificate", exc)