2015-02-05 16:36:25 +00:00
|
|
|
#include <arpa/inet.h>
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
2015-02-06 16:27:47 +00:00
|
|
|
#include <cassert>
|
2015-02-05 16:36:25 +00:00
|
|
|
#include <iostream>
|
|
|
|
|
|
2015-02-06 16:27:47 +00:00
|
|
|
#include <sodium/crypto_box.h>
|
|
|
|
|
#include <sodium/crypto_secretbox.h>
|
2015-02-07 19:01:48 +01:00
|
|
|
#include <sodium/crypto_scalarmult.h>
|
2015-02-06 16:27:47 +00:00
|
|
|
#include <sodium/randombytes.h>
|
|
|
|
|
|
2015-02-05 12:55:48 +00:00
|
|
|
#include "crypto.h"
|
2015-02-07 17:32:57 +01:00
|
|
|
|
2015-02-07 19:01:48 +01:00
|
|
|
|
|
|
|
|
#define TLV_TYPE_ENCRYPTED_BLOB 0x0000
|
|
|
|
|
#define TLV_TYPE_NONCE 0x0001
|
|
|
|
|
#define TLV_TYPE_PUBLIC_KEY 0x0002
|
|
|
|
|
|
|
|
|
|
#define TLV_TYPE_ENCRYPTED 0x8000
|
|
|
|
|
#define TLV_TYPE_CLIENT_HANDSHAKE 0x8001
|
|
|
|
|
#define TLV_TYPE_CLIENT_HANDSHAKE_SECURE 0x8002
|
2015-02-05 12:55:48 +00:00
|
|
|
|
|
|
|
|
|
2015-02-05 13:02:42 +00:00
|
|
|
void CryptoBase::GenKey(std::string* key) {
|
2015-02-06 16:27:47 +00:00
|
|
|
unsigned char buf[crypto_secretbox_KEYBYTES];
|
|
|
|
|
randombytes_buf(buf, crypto_secretbox_KEYBYTES);
|
|
|
|
|
key->assign((char*)buf, crypto_secretbox_KEYBYTES);
|
2015-02-05 13:02:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoBase::GenKeyPair(std::string* secret_key, std::string* public_key) {
|
2015-02-06 16:27:47 +00:00
|
|
|
unsigned char public_key_buf[crypto_box_PUBLICKEYBYTES];
|
|
|
|
|
unsigned char secret_key_buf[crypto_box_PUBLICKEYBYTES];
|
|
|
|
|
assert(crypto_box_keypair(public_key_buf, secret_key_buf) == 0);
|
|
|
|
|
public_key->assign((char*)public_key_buf, crypto_box_PUBLICKEYBYTES);
|
|
|
|
|
secret_key->assign((char*)secret_key_buf, crypto_box_SECRETKEYBYTES);
|
2015-02-05 12:55:48 +00:00
|
|
|
}
|
2015-02-05 16:36:25 +00:00
|
|
|
|
2015-02-07 19:01:48 +01:00
|
|
|
void CryptoBase::DerivePublicKey(const std::string& secret_key, std::string* public_key) {
|
|
|
|
|
assert(secret_key.length() == crypto_box_SECRETKEYBYTES);
|
|
|
|
|
unsigned char buf[crypto_box_PUBLICKEYBYTES];
|
|
|
|
|
assert(!crypto_scalarmult_base(buf, (const unsigned char*)secret_key.data()));
|
|
|
|
|
public_key->assign((char*)buf, crypto_box_PUBLICKEYBYTES);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoBase::EncodeEncryptAppend(const std::string& secret_key, const std::string& public_key, const TLVNode& input, TLVNode* container) {
|
|
|
|
|
std::string encoded;
|
|
|
|
|
input.Encode(&encoded);
|
|
|
|
|
|
|
|
|
|
size_t encrypted_bytes = encoded.length() + crypto_box_MACBYTES;
|
|
|
|
|
|
|
|
|
|
unsigned char nonce[crypto_box_NONCEBYTES];
|
|
|
|
|
randombytes_buf(nonce, crypto_box_NONCEBYTES);
|
|
|
|
|
|
|
|
|
|
unsigned char output[encrypted_bytes];
|
|
|
|
|
assert(!crypto_box_easy(output, (const unsigned char*)encoded.data(), encoded.length(), nonce, (const unsigned char*)public_key.data(), (const unsigned char*)secret_key.data()));
|
|
|
|
|
|
|
|
|
|
TLVNode encrypted(TLV_TYPE_ENCRYPTED);
|
|
|
|
|
encrypted.AppendChild(TLVNode(TLV_TYPE_NONCE, std::string((char*)nonce, crypto_box_NONCEBYTES)));
|
|
|
|
|
encrypted.AppendChild(TLVNode(TLV_TYPE_ENCRYPTED_BLOB, std::string((char*)output, encrypted_bytes)));
|
|
|
|
|
|
|
|
|
|
container->AppendChild(encrypted);
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-05 16:36:25 +00:00
|
|
|
|
2015-02-07 17:07:31 +01:00
|
|
|
CryptoPubServer::CryptoPubServer(const std::string& secret_key)
|
2015-02-07 16:44:42 +01:00
|
|
|
: secret_key_(secret_key),
|
|
|
|
|
event_base_(event_base_new()) {
|
2015-02-07 19:01:48 +01:00
|
|
|
assert(secret_key_.length() == crypto_box_SECRETKEYBYTES);
|
|
|
|
|
|
2015-02-07 16:44:42 +01:00
|
|
|
struct sockaddr_in6 server_addr = {0};
|
|
|
|
|
server_addr.sin6_family = AF_INET6;
|
|
|
|
|
server_addr.sin6_addr = in6addr_any;
|
|
|
|
|
server_addr.sin6_port = htons(4990);
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
listener_ = evconnlistener_new_bind(event_base_, &CryptoPubServer::OnNewConn_, this, LEV_OPT_REUSEABLE|LEV_OPT_CLOSE_ON_FREE, -1, (struct sockaddr*)&server_addr, sizeof(server_addr));
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CryptoPubServer::~CryptoPubServer() {
|
2015-02-07 16:44:42 +01:00
|
|
|
evconnlistener_free(listener_);
|
|
|
|
|
event_base_free(event_base_);
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
void CryptoPubServer::OnNewConn_(struct evconnlistener* listener, int client_fd, struct sockaddr* client_addr_, int client_addrlen, void* this__) {
|
2015-02-07 16:44:42 +01:00
|
|
|
auto this_ = (CryptoPubServer*)this__;
|
2015-02-07 17:15:09 +01:00
|
|
|
this_->OnNewConn(client_fd, client_addr_, client_addrlen);
|
|
|
|
|
}
|
2015-02-07 16:44:42 +01:00
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
void CryptoPubServer::OnNewConn(int client_fd, struct sockaddr* client_addr_, int client_addrlen) {
|
2015-02-07 16:44:42 +01:00
|
|
|
assert(client_addr_->sa_family == AF_INET6);
|
|
|
|
|
auto client_addr = (struct sockaddr_in6*)client_addr_;
|
2015-02-05 16:36:25 +00:00
|
|
|
|
|
|
|
|
char buf[128];
|
2015-02-07 16:44:42 +01:00
|
|
|
inet_ntop(AF_INET6, &client_addr->sin6_addr, buf, 128);
|
|
|
|
|
std::cerr << "New connection from [" << buf << "]:" << ntohs(client_addr->sin6_port) << std::endl;
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
auto bev = bufferevent_socket_new(this->event_base_, client_fd, BEV_OPT_CLOSE_ON_FREE);
|
2015-02-07 16:44:42 +01:00
|
|
|
bufferevent_enable(bev, EV_READ);
|
|
|
|
|
bufferevent_disable(bev, EV_WRITE);
|
2015-02-07 17:15:09 +01:00
|
|
|
auto peer = new CryptoPubServerConnection(bev, this->secret_key_);
|
|
|
|
|
bufferevent_setcb(bev, &CryptoPubServerConnection::OnReadable_, NULL, &CryptoPubServerConnection::OnError_, peer);
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubServer::Loop() {
|
2015-02-07 16:44:42 +01:00
|
|
|
event_base_dispatch(event_base_);
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-02-07 17:07:31 +01:00
|
|
|
CryptoPubServerConnection::CryptoPubServerConnection(struct bufferevent* bev, const std::string& secret_key)
|
2015-02-07 16:44:42 +01:00
|
|
|
: bev_(bev),
|
2015-02-05 21:57:04 +00:00
|
|
|
secret_key_(secret_key),
|
|
|
|
|
state_(AWAITING_HANDSHAKE) {
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 16:44:42 +01:00
|
|
|
CryptoPubServerConnection::~CryptoPubServerConnection() {
|
|
|
|
|
std::cerr << "Connection closed" << std::endl;
|
|
|
|
|
bufferevent_free(bev_);
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
void CryptoPubServerConnection::OnReadable_(struct bufferevent* bev, void* this__) {
|
2015-02-07 16:44:42 +01:00
|
|
|
auto this_ = (CryptoPubServerConnection*)this__;
|
2015-02-07 17:15:09 +01:00
|
|
|
this_->OnReadable();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubServerConnection::OnReadable() {
|
2015-02-07 19:01:48 +01:00
|
|
|
char buf[UINT16_MAX];
|
|
|
|
|
int bytes = bufferevent_read(bev_, buf, UINT16_MAX);
|
|
|
|
|
std::unique_ptr<TLVNode> decoded(TLVNode::Decode(std::string(buf, bytes)));
|
|
|
|
|
if (!decoded.get()) {
|
|
|
|
|
// TODO: re-buffer?
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
std::cerr << "successful decode" << std::endl;
|
2015-02-07 16:44:42 +01:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
void CryptoPubServerConnection::OnError_(struct bufferevent* bev, const short what, void* this__) {
|
2015-02-07 16:44:42 +01:00
|
|
|
auto this_ = (CryptoPubServerConnection*)this__;
|
2015-02-07 17:15:09 +01:00
|
|
|
this_->OnError(what);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubServerConnection::OnError(const short what) {
|
|
|
|
|
delete this;
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
2015-02-07 17:07:31 +01:00
|
|
|
|
|
|
|
|
|
2015-02-07 19:01:48 +01:00
|
|
|
CryptoPubClient::CryptoPubClient(struct sockaddr* addr, socklen_t addrlen, const std::string& secret_key, const std::string& server_public_key)
|
2015-02-07 17:07:31 +01:00
|
|
|
: event_base_(event_base_new()),
|
2015-02-07 19:01:48 +01:00
|
|
|
bev_(bufferevent_socket_new(event_base_, -1, BEV_OPT_CLOSE_ON_FREE)),
|
|
|
|
|
secret_key_(secret_key),
|
|
|
|
|
server_public_key_(server_public_key) {
|
|
|
|
|
assert(secret_key_.length() == crypto_box_SECRETKEYBYTES);
|
|
|
|
|
assert(server_public_key_.length() == crypto_box_PUBLICKEYBYTES);
|
|
|
|
|
DerivePublicKey(secret_key_, &public_key_);
|
|
|
|
|
|
2015-02-07 17:32:57 +01:00
|
|
|
bufferevent_setcb(bev_, &CryptoPubClient::OnReadable_, NULL, &CryptoPubClient::OnConnectOrError_, this);
|
|
|
|
|
bufferevent_enable(bev_, EV_READ);
|
|
|
|
|
bufferevent_enable(bev_, EV_WRITE);
|
2015-02-07 17:07:31 +01:00
|
|
|
bufferevent_socket_connect(bev_, addr, addrlen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CryptoPubClient::~CryptoPubClient() {
|
|
|
|
|
bufferevent_free(bev_);
|
|
|
|
|
event_base_free(event_base_);
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 19:01:48 +01:00
|
|
|
CryptoPubClient* CryptoPubClient::FromHostname(const std::string& server_address, const std::string& server_port, const std::string& secret_key, const std::string& server_public_key) {
|
2015-02-07 17:07:31 +01:00
|
|
|
struct addrinfo* res;
|
|
|
|
|
int gai_ret = getaddrinfo(server_address.c_str(), server_port.c_str(), NULL, &res);
|
|
|
|
|
if (gai_ret) {
|
|
|
|
|
std::cerr << "Failed to resolve server_address: " << gai_strerror(gai_ret) << std::endl;
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
2015-02-07 19:01:48 +01:00
|
|
|
auto ret = new CryptoPubClient((struct sockaddr*)res->ai_addr, res->ai_addrlen, secret_key, server_public_key);
|
2015-02-07 17:07:31 +01:00
|
|
|
freeaddrinfo(res);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:32:57 +01:00
|
|
|
void CryptoPubClient::OnReadable_(struct bufferevent* bev, void* this__) {
|
|
|
|
|
auto this_ = (CryptoPubClient*)this__;
|
|
|
|
|
this_->OnReadable();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubClient::OnReadable() {
|
|
|
|
|
std::cerr << "OnReadable" << std::endl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubClient::OnConnectOrError_(struct bufferevent* bev, const short what, void* this__) {
|
|
|
|
|
auto this_ = (CryptoPubClient*)this__;
|
|
|
|
|
if (what == BEV_EVENT_CONNECTED) {
|
|
|
|
|
this_->OnConnect();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubClient::OnConnect() {
|
2015-02-07 19:01:48 +01:00
|
|
|
std::string ephemeral_public_key;
|
|
|
|
|
GenKeyPair(&ephemeral_secret_key_, &ephemeral_public_key);
|
|
|
|
|
|
2015-02-07 17:32:57 +01:00
|
|
|
TLVNode handshake(TLV_TYPE_CLIENT_HANDSHAKE);
|
2015-02-07 19:01:48 +01:00
|
|
|
handshake.AppendChild(TLVNode(TLV_TYPE_PUBLIC_KEY, public_key_));
|
|
|
|
|
TLVNode secure_handshake(TLV_TYPE_CLIENT_HANDSHAKE_SECURE);
|
|
|
|
|
secure_handshake.AppendChild(TLVNode(TLV_TYPE_PUBLIC_KEY, ephemeral_public_key));
|
|
|
|
|
EncodeEncryptAppend(secret_key_, server_public_key_, secure_handshake, &handshake);
|
|
|
|
|
|
2015-02-07 17:32:57 +01:00
|
|
|
std::string out;
|
|
|
|
|
handshake.Encode(&out);
|
|
|
|
|
bufferevent_write(bev_, out.data(), out.length());
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:07:31 +01:00
|
|
|
void CryptoPubClient::Loop() {
|
|
|
|
|
event_base_dispatch(event_base_);
|
|
|
|
|
}
|