diff options
| author | Brandon Dahler <brandon.dahler@gmail.com> | 2013-04-13 00:13:08 -0500 |
|---|---|---|
| committer | Brandon Dahler <brandon.dahler@gmail.com> | 2013-11-10 09:36:28 -0600 |
| commit | 51ed9ec971614aebdbfbd9527aba365dd0afd437 (patch) | |
| tree | d2f910390e55aef857023812fbdaefdd66cd99ff /src/keystore.h | |
| parent | 7c4c207be8420d394a5abc4368d1bb69ad4f8067 (diff) | |
Cleanup code using forward declarations.
Use misc methods of avoiding unnecesary header includes.
Replace int typedefs with int##_t from stdint.h.
Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h.
Normalize QT_VERSION ifs where possible.
Resolve some indirect dependencies as direct ones.
Remove extern declarations from .cpp files.
Diffstat (limited to 'src/keystore.h')
| -rw-r--r-- | src/keystore.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/keystore.h b/src/keystore.h index 4f28fba91b..8d936bcab7 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -2,11 +2,13 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef BITCOIN_KEYSTORE_H #define BITCOIN_KEYSTORE_H -#include "crypter.h" +#include "key.h" #include "sync.h" + #include <boost/signals2/signal.hpp> class CScript; @@ -88,8 +90,10 @@ public: virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const; }; +typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial; typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap; + /** Keystore which keeps the private keys encrypted. * It derives from the basic key store, which is used if no encryption is active. */ |