Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-23 16:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Change spongy to bouncy for briar-headless

Browse Source
This commit is contained in:
ameba23
2021-09-07 09:58:59 +02:00
parent bb775901e3
commit 5895bc3427
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-headless/src/main/java/org/briarproject/briar/headless/Main.kt
View File

@@ -9,7 +9,7 @@ import com.github.ajalt.clikt.parameters.types.int
import org.briarproject.bramble.BrambleCoreEagerSingletons import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.briar.BriarCoreEagerSingletons import org.briarproject.briar.BriarCoreEagerSingletons
import org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY 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
import java.io.File.separator import java.io.File.separator
import java.io.IOException import java.io.IOException

4
briar-headless/src/main/java/org/briarproject/briar/headless/contact/ContactControllerImpl.kt
View File

@@ -31,8 +31,8 @@ import org.briarproject.briar.headless.getFromJson
import org.briarproject.briar.headless.json.JsonDict import org.briarproject.briar.headless.json.JsonDict
import org.eclipse.jetty.http.HttpStatus.BAD_REQUEST_400 import org.eclipse.jetty.http.HttpStatus.BAD_REQUEST_400
import org.eclipse.jetty.http.HttpStatus.FORBIDDEN_403 import org.eclipse.jetty.http.HttpStatus.FORBIDDEN_403
import org.spongycastle.util.encoders.Base64 import org.bouncycastle.util.encoders.Base64
import org.spongycastle.util.encoders.DecoderException import org.bouncycastle.util.encoders.DecoderException
import java.security.GeneralSecurityException import java.security.GeneralSecurityException
import javax.annotation.concurrent.Immutable import javax.annotation.concurrent.Immutable
import javax.inject.Inject import javax.inject.Inject

4
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
View File

@@ -38,8 +38,8 @@ import org.briarproject.briar.headless.event.output
import org.briarproject.briar.headless.getContactIdFromPathParam import org.briarproject.briar.headless.getContactIdFromPathParam
import org.briarproject.briar.headless.getFromJson import org.briarproject.briar.headless.getFromJson
import org.briarproject.briar.headless.json.JsonDict import org.briarproject.briar.headless.json.JsonDict
import org.spongycastle.util.encoders.Base64 import org.bouncycastle.util.encoders.Base64
import org.spongycastle.util.encoders.DecoderException import org.bouncycastle.util.encoders.DecoderException
import java.util.concurrent.Executor import java.util.concurrent.Executor
import javax.annotation.concurrent.Immutable import javax.annotation.concurrent.Immutable
import javax.inject.Inject import javax.inject.Inject

4
briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
View File

@@ -32,7 +32,7 @@ import org.briarproject.briar.headless.json.JsonDict
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.Assertions.assertThrows
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.spongycastle.util.encoders.Base64 import org.bouncycastle.util.encoders.Base64
import kotlin.random.Random import kotlin.random.Random
internal class MessagingControllerImplTest : ControllerTest() { internal class MessagingControllerImplTest : ControllerTest() {
@@ -205,7 +205,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
@Test @Test
fun markMessageRead() { fun markMessageRead() {
mockkStatic("org.briarproject.briar.headless.RouterKt") mockkStatic("org.briarproject.briar.headless.RouterKt")
mockkStatic("org.spongycastle.util.encoders.Base64") mockkStatic("org.bouncycastle.util.encoders.Base64")
expectGetContact() expectGetContact()
val messageIdString = message.id.bytes.toString() val messageIdString = message.id.bytes.toString()