Skip to content

Commit

Permalink
load eepsite keys
Browse files Browse the repository at this point in the history
  • Loading branch information
orignal committed Mar 19, 2014
1 parent 59d195c commit c855d8b
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
7 changes: 7 additions & 0 deletions Identity.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ namespace data
Identity& operator=(const Keys& keys);
};

struct PrivateKeys // for eepsites
{
Identity pub;
uint8_t privateKey[256];
uint8_t signingPrivateKey[20];
};

#pragma pack()

class IdentHash
Expand Down
19 changes: 17 additions & 2 deletions Streaming.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <string>
#include <fstream>
#include <algorithm>
#include <cryptopp/gzip.h>
#include "Log.h"
Expand Down Expand Up @@ -301,7 +301,6 @@ namespace stream

StreamingDestination::StreamingDestination (): m_LeaseSet (nullptr)
{
// TODO: read from file later
m_Keys = i2p::data::CreateRandomKeys ();
m_Identity = m_Keys;
m_IdentHash = i2p::data::CalculateIdentHash (m_Identity);
Expand All @@ -310,6 +309,22 @@ namespace stream
m_Pool = i2p::tunnel::tunnels.CreateTunnelPool (this);
}

StreamingDestination::StreamingDestination (const std::string& fullPath): m_LeaseSet (nullptr)
{
std::ifstream s(fullPath.c_str (), std::ifstream::binary);
if (s.is_open ())
{
i2p::data::PrivateKeys keys;
s.read ((char *)&keys, sizeof (keys));
// TODO: use PrivateKeys
m_Identity = keys.pub;
memcpy (m_Keys.privateKey, keys.privateKey, 276);
}
else
LogPrint ("Can't open file ", fullPath);
m_Pool = i2p::tunnel::tunnels.CreateTunnelPool (this);
}

StreamingDestination::~StreamingDestination ()
{
if (m_LeaseSet)
Expand Down
2 changes: 2 additions & 0 deletions Streaming.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define STREAMING_H__

#include <inttypes.h>
#include <string>
#include <map>
#include <set>
#include <cryptopp/dsa.h>
Expand Down Expand Up @@ -106,6 +107,7 @@ namespace stream
public:

StreamingDestination ();
StreamingDestination (const std::string& fullPath);
~StreamingDestination ();

const i2p::data::Keys& GetKeys () const { return m_Keys; };
Expand Down

0 comments on commit c855d8b

Please sign in to comment.