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

Renamed a load of things from 'connection' to 'stream'.

Browse Source
This commit is contained in:
akwizgran
2014-10-08 16:18:33 +01:00
parent 39f79b55ef
commit b24f153704
84 changed files with 671 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-api/src/org/briarproject/api/crypto/CryptoComponent.java
View File

@@ -71,21 +71,20 @@ public interface CryptoComponent {
SecretKey deriveTagKey(byte[] secret, boolean alice);
/**
* Derives a frame key from the given temporary secret and connection
* number.
* Derives a frame key from the given temporary secret and stream number.
* @param alice indicates whether the key is for a connection initiated by
* Alice or Bob.
* @param initiator indicates whether the key is for the initiator's or the
* responder's side of the connection.
*/
SecretKey deriveFrameKey(byte[] secret, long connection, boolean alice,
SecretKey deriveFrameKey(byte[] secret, long streamNumber, boolean alice,
boolean initiator);
/** Returns a cipher for encrypting and authenticating connections. */
/** Returns a cipher for encrypting and authenticating frames. */
AuthenticatedCipher getFrameCipher();
/** Encodes the pseudo-random tag that is used to recognise a connection. */
void encodeTag(byte[] tag, SecretKey tagKey, long connection);
/** Encodes the pseudo-random tag that is used to recognise a stream. */
void encodeTag(byte[] tag, SecretKey tagKey, long streamNumber);
/**
* Encrypts and authenticates the given plaintext so it can be written to

15
briar-api/src/org/briarproject/api/crypto/KeyManager.java
View File

@@ -3,21 +3,22 @@ package org.briarproject.api.crypto;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.lifecycle.Service;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.Endpoint;
import org.briarproject.api.transport.StreamContext;
public interface KeyManager extends Service {
/**
* Returns a connection context for connecting to the given contact over
* the given transport, or null if an error occurs or the contact does not
* support the transport.
* Returns a {@link org.briarproject.api.transport.StreamContext
* StreamContext} for sending data to the given contact over the given
* transport, or null if an error occurs or the contact does not support
* the transport.
*/
ConnectionContext getConnectionContext(ContactId c, TransportId t);
StreamContext getStreamContext(ContactId c, TransportId t);
/**
* Called whenever an endpoint has been added. The initial secret
* is erased before returning.
* Called whenever an endpoint has been added. The initial secret is erased
* before returning.
*/
void endpointAdded(Endpoint ep, long maxLatency, byte[] initialSecret);
}