From 5895bc34271659510c72a9217734f7932185b452 Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Tue, 7 Sep 2021 09:58:59 +0200
Subject: [PATCH] Change spongy to bouncy for briar-headless

---
 .../src/main/java/org/briarproject/briar/headless/Main.kt     | 2 +-
 .../briar/headless/contact/ContactControllerImpl.kt           | 4 ++--
 .../briar/headless/messaging/MessagingControllerImpl.kt       | 4 ++--
 .../briar/headless/messaging/MessagingControllerImplTest.kt   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/Main.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/Main.kt
index fd8a08b7b..7b585b3dd 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/Main.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/Main.kt
@@ -9,7 +9,7 @@ import com.github.ajalt.clikt.parameters.types.int
 import org.briarproject.bramble.BrambleCoreEagerSingletons
 import org.briarproject.briar.BriarCoreEagerSingletons
 import org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY
-import org.spongycastle.util.encoders.Base64.toBase64String
+import org.bouncycastle.util.encoders.Base64.toBase64String
 import java.io.File
 import java.io.File.separator
 import java.io.IOException
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/contact/ContactControllerImpl.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/contact/ContactControllerImpl.kt
index 168520e56..70ca60d84 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/contact/ContactControllerImpl.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/contact/ContactControllerImpl.kt
@@ -31,8 +31,8 @@ import org.briarproject.briar.headless.getFromJson
 import org.briarproject.briar.headless.json.JsonDict
 import org.eclipse.jetty.http.HttpStatus.BAD_REQUEST_400
 import org.eclipse.jetty.http.HttpStatus.FORBIDDEN_403
-import org.spongycastle.util.encoders.Base64
-import org.spongycastle.util.encoders.DecoderException
+import org.bouncycastle.util.encoders.Base64
+import org.bouncycastle.util.encoders.DecoderException
 import java.security.GeneralSecurityException
 import javax.annotation.concurrent.Immutable
 import javax.inject.Inject
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
index 251d74670..63e91aedf 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
@@ -38,8 +38,8 @@ import org.briarproject.briar.headless.event.output
 import org.briarproject.briar.headless.getContactIdFromPathParam
 import org.briarproject.briar.headless.getFromJson
 import org.briarproject.briar.headless.json.JsonDict
-import org.spongycastle.util.encoders.Base64
-import org.spongycastle.util.encoders.DecoderException
+import org.bouncycastle.util.encoders.Base64
+import org.bouncycastle.util.encoders.DecoderException
 import java.util.concurrent.Executor
 import javax.annotation.concurrent.Immutable
 import javax.inject.Inject
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
index a3a9d49c4..4291ee309 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
@@ -32,7 +32,7 @@ import org.briarproject.briar.headless.json.JsonDict
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
-import org.spongycastle.util.encoders.Base64
+import org.bouncycastle.util.encoders.Base64
 import kotlin.random.Random
 
 internal class MessagingControllerImplTest : ControllerTest() {
@@ -205,7 +205,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
     @Test
     fun markMessageRead() {
         mockkStatic("org.briarproject.briar.headless.RouterKt")
-        mockkStatic("org.spongycastle.util.encoders.Base64")
+        mockkStatic("org.bouncycastle.util.encoders.Base64")
         expectGetContact()
 
         val messageIdString = message.id.bytes.toString()