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

Log client ID from server

Browse Source
This commit is contained in:
Ian Gulliver
2015-02-07 13:38:51 -08:00
parent 36bdebe5e0
commit cdd059370d
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crypto.cc
View File

@@ -26,6 +26,17 @@
#define TLV_TYPE_SERVER_HANDSHAKE_SECURE 0x8002 #define TLV_TYPE_SERVER_HANDSHAKE_SECURE 0x8002
std::string CryptoBase::BinToHex(const std::string& bin) {
static const char hex[] = "0123456789abcdef";
std::string ret;
ret.reserve(bin.length() * 2);
for (int i = 0; i < bin.length(); i++) {
ret.push_back(hex[(bin[i] & 0xf0) >> 4]);
ret.push_back(hex[bin[i] & 0x0f]);
}
return ret;
}
void CryptoBase::GenKey(std::string* key) { void CryptoBase::GenKey(std::string* key) {
unsigned char buf[crypto_secretbox_KEYBYTES]; unsigned char buf[crypto_secretbox_KEYBYTES];
randombytes_buf(buf, crypto_secretbox_KEYBYTES); randombytes_buf(buf, crypto_secretbox_KEYBYTES);
@@ -243,7 +254,7 @@ void CryptoPubServerConnection::OnHandshake(const std::string& input) {
bufferevent_write(bev_, out.data(), out.length()); bufferevent_write(bev_, out.data(), out.length());
this->state_ = READY; this->state_ = READY;
Log() << "Handshake successful" << std::endl; Log() << "Handshake successful (client ID: " << BinToHex(client_public_key_) << ")" << std::endl;
} }
void CryptoPubServerConnection::OnError_(struct bufferevent* bev, const short what, void* this__) { void CryptoPubServerConnection::OnError_(struct bufferevent* bev, const short what, void* this__) {

2
crypto.h
View File

@@ -10,6 +10,8 @@ class CryptoBase {
public: public:
virtual ~CryptoBase() {}; virtual ~CryptoBase() {};
static std::string BinToHex(const std::string& bin);
static void GenKey(std::string* key); static void GenKey(std::string* key);
static void GenKeyPair(std::string* secret_key, std::string* public_key); static void GenKeyPair(std::string* secret_key, std::string* public_key);
static void DerivePublicKey(const std::string& secret_key, std::string* public_key); static void DerivePublicKey(const std::string& secret_key, std::string* public_key);