Moved interfaces to their respective files

aes.go

@@ -8,6 +8,17 @@ import (
 	"io"
 )
 
+type AES interface {
+	Encrypt([]byte, []byte, []byte) ([]byte, error)
+	Decrypt([]byte, []byte, []byte) ([]byte, error)
+	GenerateAESKey(io.Reader) ([]byte, error)
+	GenerateAESNonce(io.Reader) ([]byte, error)
+	EncryptHeader(Header, []byte, []byte) ([]byte, error)
+	DecryptHeader([]byte, []byte, []byte) (*Header, error)
+	EncryptMessageBody(interface{}, []byte, []byte) ([]byte, error)
+	DecryptMessageBody([]byte, []byte, []byte, int) (interface{}, error)
+}
+
 type aesTools struct {
 	AES
 }

chat.go

@@ -11,6 +11,16 @@ import (
 	"github.com/firstrow/tcp_server"
 )
 
+type Chat interface {
+	InitializeConversation(*string) (*string, error)
+	InitiateConnection() error
+	NegotiateNewKeys() error
+	SendTextMessage(string) error
+	State() ChatInformation
+	StartServer()
+	StartKeyNegotiatingService()
+}
+
 type chatTools struct {
 	Chat
 	ChatState ChatInformation

conversation.go

@@ -11,6 +11,28 @@ import (
 	"time"
 )
 
+type Conversation interface {
+	CreateSendKeyInitializers(int) ([]MessageKeyInitializer, error)
+	CreateReceiveKeyInitializers(int) ([]MessageKeyInitializer, error)
+	ComputeKeyMessages([]MessageKeyInitializer, []MessageKeyInitializer) ([]MessageKey, error)
+	State() ConversationInfo
+	ReceiveMessage(MessageEncrypted) error
+	GetSendMessageKey(int) (*MessageKey, error)
+	GetReceiveMessageKey(int) (*MessageKey, error)
+	GetReceiveMessageKeyInitializer(int) (*MessageKeyInitializer, error)
+	RemoveReceiveMessageKey(int) error
+	RemoveSendMessageKey(int) error
+	HandleNegotiateKeysMessage(*NegotiateKeysMessage) error
+	HandleTextMessage(*TextMessage) error
+	PrepareMessage(MessageUnencrypted) (*MessageEncrypted, error)
+	SendMessage(MessageEncrypted) error
+	PrepareNegotiateKeysMessage(*[]MessageKeyInitializer, *[]MessageKeyInitializer) error
+	StartConnection(MessageUnencrypted) error
+	NegotiateKeys(MessageUnencrypted) error
+	ReceiveMessageProcessor(chan MessageEncrypted)
+	StartSendService()
+}
+
 type conversationTools struct {
 	Conversation
 	ConversationState ConversationInfo

curve25519.go

@@ -7,6 +7,13 @@ import (
 	"golang.org/x/crypto/curve25519"
 )
 
+type ECDH interface {
+	GenerateKey(io.Reader) (crypto.PrivateKey, crypto.PublicKey, error)
+	Marshal(crypto.PublicKey) []byte
+	Unmarshal([]byte) (crypto.PublicKey, bool)
+	GenerateSharedSecret(crypto.PrivateKey, crypto.PublicKey) ([]byte, error)
+}
+
 type curve25519ECDH struct {
 	ECDH
 }

examples/command_line_chat.go

@@ -1,4 +1,4 @@
-package tormessage
+package main
 
 import (
 	"bufio"

examples/desktop.go

@@ -1,4 +1,4 @@
-package tormessage
+package main
 
 import (
 	"fmt"

messages.go

@@ -8,6 +8,13 @@ import (
 	"io"
 )
 
+type Messages interface {
+	EncryptMessage(MessageUnencrypted, MessageKey, rsa.PrivateKey) (*MessageEncrypted, error)
+	DecryptMessage(MessageEncrypted, MessageKey) (*MessageUnencrypted, error)
+	SignMessage(io.Reader, rsa.PrivateKey, MessageEncrypted) (*MessageEncrypted, error)
+	VerifyMessage(io.Reader, rsa.PublicKey, MessageEncrypted) error
+}
+
 type messageTools struct {
 	Messages
 }

rsa.go

@@ -5,6 +5,10 @@ import (
 	"io"
 )
 
+type RSA interface {
+	GenerateRSAKey(io.Reader) (*rsa.PrivateKey, *rsa.PublicKey, error)
+}
+
 type rsaTools struct {
 	RSA
 }

tormessage.go

@@ -4,73 +4,8 @@ import (
 	"crypto"
 	"crypto/rsa"
 	"encoding/gob"
-	"io"
 )
 
-type ECDH interface {
-	GenerateKey(io.Reader) (crypto.PrivateKey, crypto.PublicKey, error)
-	Marshal(crypto.PublicKey) []byte
-	Unmarshal([]byte) (crypto.PublicKey, bool)
-	GenerateSharedSecret(crypto.PrivateKey, crypto.PublicKey) ([]byte, error)
-}
-
-type RSA interface {
-	GenerateRSAKey(io.Reader) (*rsa.PrivateKey, *rsa.PublicKey, error)
-}
-type AES interface {
-	Encrypt([]byte, []byte, []byte) ([]byte, error)
-	Decrypt([]byte, []byte, []byte) ([]byte, error)
-	GenerateAESKey(io.Reader) ([]byte, error)
-	GenerateAESNonce(io.Reader) ([]byte, error)
-	EncryptHeader(Header, []byte, []byte) ([]byte, error)
-	DecryptHeader([]byte, []byte, []byte) (*Header, error)
-	EncryptMessageBody(interface{}, []byte, []byte) ([]byte, error)
-	DecryptMessageBody([]byte, []byte, []byte, int) (interface{}, error)
-}
-
-type Messages interface {
-	EncryptMessage(MessageUnencrypted, MessageKey, rsa.PrivateKey) (*MessageEncrypted, error)
-	DecryptMessage(MessageEncrypted, MessageKey) (*MessageUnencrypted, error)
-	SignMessage(io.Reader, rsa.PrivateKey, MessageEncrypted) (*MessageEncrypted, error)
-	VerifyMessage(io.Reader, rsa.PublicKey, MessageEncrypted) error
-}
-
-type Conversation interface {
-	CreateSendKeyInitializers(int) ([]MessageKeyInitializer, error)
-	CreateReceiveKeyInitializers(int) ([]MessageKeyInitializer, error)
-	ComputeKeyMessages([]MessageKeyInitializer, []MessageKeyInitializer) ([]MessageKey, error)
-	State() ConversationInfo
-	ReceiveMessage(MessageEncrypted) error
-	GetSendMessageKey(int) (*MessageKey, error)
-	GetReceiveMessageKey(int) (*MessageKey, error)
-	GetReceiveMessageKeyInitializer(int) (*MessageKeyInitializer, error)
-	RemoveReceiveMessageKey(int) error
-	RemoveSendMessageKey(int) error
-	HandleNegotiateKeysMessage(*NegotiateKeysMessage) error
-	HandleTextMessage(*TextMessage) error
-	PrepareMessage(MessageUnencrypted) (*MessageEncrypted, error)
-	SendMessage(MessageEncrypted) error
-	PrepareNegotiateKeysMessage(*[]MessageKeyInitializer, *[]MessageKeyInitializer) error
-	StartConnection(MessageUnencrypted) error
-	NegotiateKeys(MessageUnencrypted) error
-	ReceiveMessageProcessor(chan MessageEncrypted)
-	StartSendService()
-}
-
-type Chat interface {
-	InitializeConversation(*string) (*string, error)
-	InitiateConnection() error
-	NegotiateNewKeys() error
-	SendTextMessage(string) error
-	State() ChatInformation
-	StartServer()
-	StartKeyNegotiatingService()
-}
-
-type Desktop interface {
-	StartApp() error
-}
-
 type DesktopInformation struct {
 	Platform string
 	Chat     Chat