Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Rename, clarifying this is not an address; it has no scheme, no .onion

Browse Source
This commit is contained in:
Daniel Lublin
2022-03-18 14:04:08 +01:00
parent 5bc5791ddb
commit 13eebe393a
15 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java
View File

@@ -175,9 +175,11 @@ public interface CryptoComponent {
String asciiArmour(byte[] b, int lineLength);
/**
* Encode the onion/hidden service address given its public key. As
* specified here: https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt?id=29245fd5#n2135
* Encode the Onion given its public key. Specified here:
* https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt?id=29245fd5#n2135
*
* @return the encoded onion, base32 chars
*/
String encodeOnionAddress(byte[] publicKey);
String encodeOnion(byte[] publicKey);
}

10
bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPropertiesUpdate.java
View File

@@ -8,22 +8,22 @@ import javax.annotation.concurrent.Immutable;
@NotNullByDefault
public class MailboxPropertiesUpdate {
private final String onionAddress;
private final String onion;
private final MailboxAuthToken authToken;
private final MailboxFolderId inboxId;
private final MailboxFolderId outboxId;
public MailboxPropertiesUpdate(String onionAddress,
public MailboxPropertiesUpdate(String onion,
MailboxAuthToken authToken, MailboxFolderId inboxId,
MailboxFolderId outboxId) {
this.onionAddress = onionAddress;
this.onion = onion;
this.authToken = authToken;
this.inboxId = inboxId;
this.outboxId = outboxId;
}
public String getOnionAddress() {
return onionAddress;
public String getOnion() {
return onion;
}
public MailboxAuthToken getAuthToken() {

6
bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPropertyManager.java
View File

@@ -35,15 +35,15 @@ public interface MailboxPropertyManager {
/**
* The required properties of a non-empty update message.
*/
String PROP_KEY_ONIONADDRESS = "onionAddress";
String PROP_KEY_ONION = "onion";
String PROP_KEY_AUTHTOKEN = "authToken";
String PROP_KEY_INBOXID = "inboxId";
String PROP_KEY_OUTBOXID = "outboxId";
/**
* Length of the Onion Address property.
* Length of the Onion property.
*/
int PROP_ONIONADDRESS_LENGTH = 56;
int PROP_ONION_LENGTH = 56;
/**
* Message metadata key for the version number of a local or remote update,

2
bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java
View File

@@ -281,7 +281,7 @@ public class TestUtils {
if (a == null || b == null) {
return a == b;
}
return a.getOnionAddress().equals(b.getOnionAddress()) &&
return a.getOnion().equals(b.getOnion()) &&
a.getAuthToken().equals(b.getAuthToken()) &&
a.getInboxId().equals(b.getInboxId()) &&
a.getOutboxId().equals(b.getOutboxId());