cpp/funstraw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start of a connection state machine, start of a TLV framework.

Browse Source
This commit is contained in:
Ian Gulliver
2015-02-05 21:57:04 +00:00
parent c91b64f892
commit dcbc3d6928
5 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -3,11 +3,11 @@ all: auth-server gen-key gen-keypair
%.o: %.cc %.o: %.cc
g++ -std=c++11 -c -o $@ $< g++ -std=c++11 -c -o $@ $<
auth-server: auth-server.o crypto.o auth-server: auth-server.o crypto.o tlv.o
g++ -o auth-server auth-server.o crypto.o nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a g++ -o auth-server auth-server.o crypto.o tlv.o nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a
gen-key: gen-key.o crypto.o gen-key: gen-key.o crypto.o tlv.o
g++ -o gen-key gen-key.o crypto.o nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a g++ -o gen-key gen-key.o crypto.o tlv.o nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a
gen-keypair: gen-keypair.o crypto.o gen-keypair: gen-keypair.o crypto.o tlv.o
g++ -o gen-keypair gen-keypair.o crypto.o nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a g++ -o gen-keypair gen-keypair.o crypto.o tlv.o nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a

3
crypto.cc
View File

@@ -89,7 +89,8 @@ void CryptoPubServer::Loop() {
CryptoPubServerConnection::CryptoPubServerConnection(const int fd, const std::string secret_key) CryptoPubServerConnection::CryptoPubServerConnection(const int fd, const std::string secret_key)
: CryptoBase(fd), : CryptoBase(fd),
secret_key_(secret_key) { secret_key_(secret_key),
state_(AWAITING_HANDSHAKE) {
} }
void CryptoPubServerConnection::OnReadable() { void CryptoPubServerConnection::OnReadable() {

5
crypto.h
View File

@@ -23,6 +23,11 @@ class CryptoPubServerConnection : public CryptoBase {
private: private:
const std::string secret_key_; const std::string secret_key_;
const std::string ephemeral_secret_key_; const std::string ephemeral_secret_key_;
const std::string client_public_key_;
enum {
AWAITING_HANDSHAKE,
READY,
} state_;
}; };
class CryptoPubServer : public CryptoBase { class CryptoPubServer : public CryptoBase {

8
tlv.cc Normal file
View File

@@ -0,0 +1,8 @@
#include "tlv.h"
TLVNode::TLVNode(const uint16_t type)
: type_(type) {}
TLVNode::TLVNode(const uint16_t type, const std::string value)
: type_(type),
value_(value) {}

18
tlv.h Normal file
View File

@@ -0,0 +1,18 @@
#include <stdint.h>
#include <list>
#include <string>
class TLVNode {
public:
TLVNode(const uint16_t type);
TLVNode(const uint16_t type, const std::string value);
static TLVNode* Decode(const std::string& input);
void Encode(std::string *output);
private:
const uint16_t type_;
const std::string value_;
std::list<TLVNode> children_;
};