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

Store the incoming and outgoing secrets separately.

Browse Source
This commit is contained in:
akwizgran
2011-11-15 16:07:14 +00:00
parent f41d48eb9f
commit 6a15c03e81
26 changed files with 200 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/net/sf/briar/api/crypto/CryptoComponent.java
View File

@@ -9,20 +9,16 @@ import javax.crypto.Mac;
public interface CryptoComponent {
ErasableKey deriveIncomingFrameKey(byte[] secret);
ErasableKey deriveFrameKey(byte[] source, boolean initiator);
ErasableKey deriveIncomingIvKey(byte[] secret);
ErasableKey deriveIvKey(byte[] source, boolean initiator);
ErasableKey deriveIncomingMacKey(byte[] secret);
ErasableKey deriveOutgoingFrameKey(byte[] secret);
ErasableKey deriveOutgoingIvKey(byte[] secret);
ErasableKey deriveOutgoingMacKey(byte[] secret);
ErasableKey deriveMacKey(byte[] source, boolean initiator);
KeyPair generateKeyPair();
ErasableKey generateTestKey();
Cipher getFrameCipher();
Cipher getIvCipher();
@@ -36,6 +32,4 @@ public interface CryptoComponent {
SecureRandom getSecureRandom();
Signature getSignature();
ErasableKey generateTestKey();
}

7
api/net/sf/briar/api/db/DatabaseComponent.java
View File

@@ -53,10 +53,11 @@ public interface DatabaseComponent {
void removeListener(DatabaseListener d);
/**
* Adds a new contact to the database with the given secret and returns an
* Adds a new contact to the database with the given secrets and returns an
* ID for the contact.
*/
ContactId addContact(byte[] secret) throws DbException;
ContactId addContact(byte[] incomingSecret, byte[] outgoingSecret)
throws DbException;
/** Adds a locally generated group message to the database. */
void addLocalGroupMessage(Message m) throws DbException;
@@ -158,7 +159,7 @@ public interface DatabaseComponent {
throws DbException;
/** Returns the secret shared with the given contact. */
byte[] getSharedSecret(ContactId c) throws DbException;
byte[] getSharedSecret(ContactId c, boolean incoming) throws DbException;
/** Returns the set of groups to which the user subscribes. */
Collection<Group> getSubscriptions() throws DbException;

5
api/net/sf/briar/api/transport/ConnectionReaderFactory.java
View File

@@ -8,14 +8,15 @@ public interface ConnectionReaderFactory {
/**
* Creates a connection reader for a batch-mode connection or the
* initiator's side of a stream-mode connection.
* initiator's side of a stream-mode connection. The secret is erased before
* returning.
*/
ConnectionReader createConnectionReader(InputStream in, TransportIndex i,
byte[] encryptedIv, byte[] secret);
/**
* Creates a connection reader for the responder's side of a stream-mode
* connection.
* connection. The secret is erased before returning.
*/
ConnectionReader createConnectionReader(InputStream in, TransportIndex i,
long connection, byte[] secret);

5
api/net/sf/briar/api/transport/ConnectionWriterFactory.java
View File

@@ -8,14 +8,15 @@ public interface ConnectionWriterFactory {
/**
* Creates a connection writer for a batch-mode connection or the
* initiator's side of a stream-mode connection.
* initiator's side of a stream-mode connection. The secret is erased before
* returning.
*/
ConnectionWriter createConnectionWriter(OutputStream out, long capacity,
TransportIndex i, long connection, byte[] secret);
/**
* Creates a connection writer for the responder's side of a stream-mode
* connection.
* connection. The secret is erased before returning.
*/
ConnectionWriter createConnectionWriter(OutputStream out, long capacity,
TransportIndex i, byte[] encryptedIv, byte[] secret);