cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-03 10:16:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,899 Commits 8 Branches 349 Tags
Commit Graph

62 Commits

Author SHA1 Message Date
Luke Dashjr
fad2231f86 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/main.cpp
	src/serialize.h
 2012-06-20 19:02:33 +00:00
Ricardo M. Correia
b0d9f41cd2 Don't overflow integer on 32-bit machines. 
This was causing test_bitcoin to abort on a 32-bit system likely due to -ftrapv.
 2012-06-18 19:39:10 +00:00
Gavin Andresen
0ce74bfaa5 Use std::numeric_limits<> for typesafe INT_MAX/etc 
(this fixes a Mac OS X gitian build error for 0.5.x)
 2012-06-14 20:38:25 +00:00
Gavin Andresen
5cd2a640a5 Use std::numeric_limits<> for typesafe INT_MAX/etc 
(this fixes a Mac OS X gitian build error for 0.5.x)
 2012-06-14 19:52:31 +00:00
Fordy
58ac600b2c Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:15:41 +00:00
Fordy
b2de28c740 Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:10:24 +00:00
Luke Dashjr
d05c03ab4e Merge branch '0.5.0.x' into 0.5.x 2012-03-11 22:21:06 -04:00
Luke Dashjr
b4f8c8f5f9 Merge branch '0.4.x' into 0.5.0.x 2012-03-11 22:20:31 -04:00
Gregory Maxwell
11c34e0f6c Resolves issue #922 - "wallet passphrase timeout of several years doesn't work" 
2^31 milliseconds is only about 25 days. Also clamps Sleep() to 10 years,
because it currently sleeps for 0 seconds when the sleep time would cross
2^31 seconds since the epoch. Hopefully boost will be fixed by 2028.
 2012-03-11 21:53:47 -04:00
Luke Dashjr
6fb186f4bb Merge branch '0.5.0.x' into 0.5.x 2012-02-17 09:40:00 -05:00
Luke Dashjr
fdb365df0e Merge branch '0.4.x' into 0.5.0.x 2012-02-17 09:39:54 -05:00
Pieter Wuille
43163a5a4d Macros for manual critical sections 2012-02-17 09:38:13 -05:00
Luke Dashjr
a21e4da901 Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-02-07 22:49:03 -05:00
Luke Dashjr
b5d9c7d9fb Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-02-07 22:46:07 -05:00
Luke Dashjr
4664aae3fe Update copyrights to 2012 for files modified this year 2012-02-07 22:30:50 -05:00
Luke Dashjr
a0db9a79e5 Merge branch '0.5.0.x' into 0.5.x 2012-01-23 22:45:47 -05:00
Lars Rasmusson
b0870346f2 Replace tabs with four spaces to comply with coding standard in doc/coding.txt 2012-01-23 22:38:30 -05:00
Luke Dashjr
a2e9767225 Merge branch '0.5.0.x' into 0.5.x 2012-01-03 12:23:09 -05:00
Luke Dashjr
eb2a10afd6 Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/util.cpp
 2012-01-03 12:19:48 -05:00
Gavin Andresen
84393f15b6 Fix issue #659, and cleanup wallet/command-line argument handling a bit 
Conflicts:
	src/init.cpp
	src/util.cpp
 2012-01-03 11:48:44 -05:00
Luke Dashjr
961cf14ab3 Merge branch '0.5.0.x' into 0.5.x 2011-12-23 10:09:13 -05:00
Dylan Noblesmith
96f1723bb1 Implement an mlock()'d string class for storing passphrases 
SecureString is identical to std::string except with secure_allocator
substituting for std::allocator. This makes casting between them
impossible, so converting between the two at API boundaries requires
calling ::c_str() for now.
 2011-12-20 18:42:30 -05:00
Dylan Noblesmith
94f778bdeb Implement an mlock()'d string class for storing passphrases 
SecureString is identical to std::string except with secure_allocator
substituting for std::allocator. This makes casting between them
impossible, so converting between the two at API boundaries requires
calling ::c_str() for now.
 2011-11-26 06:02:04 +00:00
Clark Gaebel
3083cf100a Cleaned up the critical section macros. 2011-11-02 04:33:55 -04:00
Victor Leschuk
600dc62559 Fix for 64bit build 2011-10-07 11:04:04 -04:00
Gavin Andresen
6853e627f1 Fix build on windows and mac 
Replaced all occurrences of #if* __WXMSW__ with WIN32,
and all occurrences of __WXMAC_OSX__ with MAC_OSX, and made
sure those are defined appropriately in the makefile and bitcoin-qt.pro.
 2011-10-07 11:02:21 -04:00
Victor Leschuk
b95e6376d0 Fix for 64bit build 2011-10-06 19:53:42 +04:00
Nils Schneider
452506fc41 simpler ByteReverse 2011-09-30 20:00:30 +02:00
Nils Schneider
6ccff2cbde remove cryptopp dependency, add simple unittest for SHA256Transform() 2011-09-30 20:00:22 +02:00
Gavin Andresen
f4769e44a3 Merge pull request #524 from sipa/signandverif 
Sign and verify message with bitcoin address
 2011-09-30 05:04:26 -07:00
Wladimir J. van der Laan
20091df725 Add assertion size>0 to MedianFilter 2011-09-29 17:17:42 +02:00
Wladimir J. van der Laan
002a4dcad0 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	.gitignore (used upstream version)
	bitcoin-qt.pro
 2011-09-28 21:52:32 +02:00
Wladimir J. van der Laan
a8b95ce6ed use median filter for peer-reported reported number of blocks 
- fixes problem that one misconfigured or malicious node can mess up progress bar
- implementation in src/util.h
- testcase in src/test/util_tests.cpp
 2011-09-28 21:35:58 +02:00
Pieter Wuille
4b603f1cd6 Inline base64 encoder/decoder 
This replaces the openssl-based base64 encoder and decoder with a more
efficient internal one. Tested against the rfc4648 test vectors.

Decoder is based on JoelKatz' version.
 2011-09-27 19:47:35 +02:00
JoelKatz
4e67a6216b Faster Base64 decoder. 2011-09-27 19:47:34 +02:00
Gavin Andresen
565c4771b6 Remove wxWidgets 
Makefiles now build bitcoind only.
qmake/make in top-level directory is used to build Bitcoin QT
Deleted almost all #ifdef GUI from the code (left one possibly controversial one)
Deleted xpm/ files.
 2011-09-26 10:04:04 -04:00
Gavin Andresen
17e2c24645 Merge pull request #517 from gavinandresen/DoSprevention 
Denial-of-service prevention
 2011-09-26 06:06:16 -07:00
Gavin Andresen
54d02f158d SetMockTime() for cleaner unit testing 2011-09-21 12:01:56 -04:00
Jeff Garzik
cbd959c473 Revert "Define MSG_NOSIGNAL to 0 on platforms where it is unavailable." 
This reverts commit 6a0296791d5e81102a12a3142f5be25cb40f9825.

The change breaks build on Fedora Linux.
 2011-09-06 16:19:54 -04:00
Venkatesh Srinivas
6a0296791d Define MSG_NOSIGNAL to 0 on platforms where it is unavailable. 
Enables building bitcoind on OpenBSD.
 2011-09-06 14:54:10 -04:00
Wladimir J. van der Laan
7a15d4ff67 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/main.cpp
 2011-09-02 17:35:30 +02:00
Wladimir J. van der Laan
adce862c27 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-08-22 14:43:37 +02:00
Giel van Schijndel
82dc6426b4 Move func 'REF' from util.h to serialize.h 
util.h doesn't use REF, serialize.h does, creating a dependency of
serialize.h on util.h, but util.h already depends on serialize.h.  To
resolve this circular dependency the function 'REF' has now been moved
closer to one of its two points of use.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
 2011-08-19 07:24:38 +02:00
Gavin Andresen
865ed8a1e5 Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks 2011-08-17 10:22:28 -04:00
Wladimir J. van der Laan
b90c9ecb13 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-08-16 10:28:24 +02:00
Matt Corallo
b2120e223a Unify copyright notices. 
To a variation on:
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2011 The Bitcoin developers
 2011-08-09 13:32:52 +02:00
Wladimir J. van der Laan
330c190958 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-08-06 18:45:15 +02:00
JoelKatz
67ed7d9d49 Fix UNIX-specific thread handle leak. 2011-07-25 15:06:45 -07:00
Wladimir J. van der Laan
d421117620 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-07-15 16:42:44 +02:00
Giel van Schijndel
ecf1c79aad fix warnings: expression result unused [-Wunused-value] 
In the assert()s take advantage of the fact that string constants
("string") are effectively of type 'const char []', which when used in
an expression yield a non-NULL pointer.

An assertion that should always fail can thus be formulated as:
  assert(!"fail);

An assertion where a text message should be added to the expression can
be written as such:
  assert("message" && expression);

Signed-off-by: Giel van Schijndel <me@mortis.eu>
 2011-07-13 05:07:44 +02:00