highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 23:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,826 Commits 8 Branches 346 Tags
d53af9c729dedddfce575c21c837900bae41ba68
Commit Graph

3826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Dashjr
d53af9c729 Merge branch '0.6.x' into 0.7.x 
Conflicts:
	src/bitcoinrpc.cpp
v0.7.2rc2 		2012-11-29 03:36:23 +00:00
Luke Dashjr
6634e6dc42 Merge branch '0.6.0.x' into 0.6.x 2012-11-29 03:35:55 +00:00
Luke Dashjr
3a72e91e3a Merge branch '0.5.x' into 0.6.0.x 2012-11-29 03:35:44 +00:00
Luke Dashjr
72c8166589 Merge branch '0.4.x' into 0.5.x 2012-11-29 03:35:35 +00:00
Philip Kaufmann
2a9301b75a do not silently ignore errors on "backupwallet" RPC cmd 2012-11-29 03:35:25 +00:00
Luke Dashjr
0dba651def Bump versions for 0.7.2 release, including updated release notes 2012-11-22 20:03:33 +00:00
Philip Kaufmann
0d989a99d0 Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown() 
- can be triggerd by just adding -proxy=crashme with 0.7.1
- crash occured, when AppInit2() was left with return false; after the
  first call to bitdb.open() (Step 6 in init)
- this is caused by GetDataDir() or .string() in CDBEnv::EnvShutdown()
  called via the bitdb global destructor
- init fDbEnvInit and fMockDb to false in CDBEnv::CDBEnv()
 2012-11-22 19:45:03 +00:00
Luke Dashjr
cb44c07349 Merge branch '0.6.x' into 0.7.x 
Conflicts:
	src/main.cpp
 2012-11-17 09:06:06 +00:00
Luke Dashjr
6d3d1b985f Merge branch '0.6.0.x' into 0.6.x 2012-11-17 09:05:19 +00:00
Luke Dashjr
c3f45b4449 Merge branch '0.5.x' into 0.6.0.x 2012-11-17 09:05:13 +00:00
Luke Dashjr
506061360a Merge branch '0.4.x' into 0.5.x 2012-11-17 09:05:07 +00:00
Philip Kaufmann
6247c53528 ConnectBlock(): fix error() format to be unsigned 
- I introduced the wrong format macro with my former patch (#2018), this
  needs to be signed not unsigned (thanks Luke-Jr)
 2012-11-17 09:04:56 +00:00
Philip Kaufmann
57af0d8ef0 ensure we use our format macros to avoid compilation warnings 
- fixes 2 warnings I observed while compiling on Windows with MinGW
 2012-11-17 09:04:53 +00:00
Luke Dashjr
82283aec3d Revert translation adjustments for NACK'd 0.7.2 changes. 
This partially reverts commit acbdc05560.
 2012-11-16 20:49:15 +00:00
Luke Dashjr
c07e181cca Revert NACK'd fixes for 0.7.2. 
This reverts commits:
- 220de9aafb Qt: small header changes / fixes
- caeafd1bd1 fix some double-spaces in strings
- deb9f100a0 fix some double-spaces in strings
- 65cee0bbbd don't use memset() in privacy/security relevant code parts
- ff31f1fa10 don't use memset() in privacy/security relevant code parts
 2012-11-16 20:49:11 +00:00
Luke Dashjr
ab67ec8695 Merge branch '0.6.x' into 0.7.x 
Conflicts:
	src/main.cpp
 2012-11-16 20:48:58 +00:00
Luke Dashjr
9845499fa1 Merge branch '0.6.0.x' into 0.6.x 2012-11-16 20:48:34 +00:00
grimd34th
0b37038d2b VariantClear@4 + shutdown@8 patch 
merged 2 windows:LIBS lines so they happen when they need to (#976)
added -loleaut32 to fix VariantClear
moved -lws2_32 and others to existing windows:LIBS line
 2012-11-16 20:48:27 +00:00
Luke Dashjr
c510f571dc Merge branch '0.5.x' into 0.6.0.x 2012-11-16 20:44:01 +00:00
Luke Dashjr
3ba638b59a Merge branch '0.4.x' into 0.5.x 2012-11-16 20:43:23 +00:00
Luke Dashjr
6d6bf32064 Print error for coinbase-pays-too-much case of ConnectBlock failing 2012-11-16 19:51:25 +00:00
Pieter Wuille
2a333587bd Prevent RPC 'move' from deadlocking 
It seemed to create two CWalletDB objects that both grab the
database lock.
 2012-11-16 18:47:41 +00:00
Luke Dashjr
acbdc05560 Update supported translations 2012-11-14 23:08:34 +00:00
Luke Dashjr
e4ac5b3e5f Update supported translations 2012-11-14 22:55:43 +00:00
Luke Dashjr
13b0b1cd3d Update supported translations 2012-11-14 22:53:34 +00:00
Luke Dashjr
bbd76e0717 Update supported translations 2012-11-14 22:52:02 +00:00
Luke Dashjr
c6911a9755 Merge branch '0.6.x' into 0.7.x 
Conflicts:
	src/bitcoinrpc.cpp
	src/crypter.h
	src/main.cpp
	src/qt/bitcoin.cpp
	src/qt/qtipcserver.cpp
	src/util.cpp
 2012-11-14 21:32:36 +00:00
Luke Dashjr
f1a9aad789 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/init.cpp
	src/main.cpp
	src/serialize.h
 2012-11-14 21:26:56 +00:00
Luke Dashjr
8045273a01 Merge branch '0.5.x' into 0.6.0.x 2012-11-14 21:25:35 +00:00
Luke Dashjr
d9b50a8cfd Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-11-14 21:25:29 +00:00
Philip Kaufmann
ff31f1fa10 don't use memset() in privacy/security relevant code parts 
As memset() can be optimized out by a compiler it should not be used in
privacy/security relevant code parts. OpenSSL provides the safe
OPENSSL_cleanse() function in crypto.h, which perfectly does the job of
clean and overwrite data.

For details see: http://www.viva64.com/en/b/0178/

- change memset() to OPENSSL_cleanse() where appropriate
- change a hard-coded number from netbase.cpp into a sizeof()
 2012-11-12 23:55:22 +00:00
Philip Kaufmann
65cee0bbbd don't use memset() in privacy/security relevant code parts 
As memset() can be optimized out by a compiler it should not be used in
privacy/security relevant code parts. OpenSSL provides the safe
OPENSSL_cleanse() function in crypto.h, which perfectly does the job of
clean and overwrite data.

For details see: http://www.viva64.com/en/b/0178/

- change memset() to OPENSSL_cleanse() where appropriate
- change a hard-coded number from netbase.cpp into a sizeof()
 2012-11-12 23:53:55 +00:00
Philip Kaufmann
220de9aafb Qt: small header changes / fixes 
- ensure header inclusion guard is named after the header file
- add missing comments at the end of some inclusion guards
- add a small Qt5 compatibility fix in macdockiconhandler.h
 2012-11-12 23:42:55 +00:00
Philip Kaufmann
deb9f100a0 fix some double-spaces in strings 
(partial of 6b3783a9c9)
 2012-11-12 23:32:44 +00:00
Philip Kaufmann
caeafd1bd1 fix some double-spaces in strings 
(partial of 6b3783a9c9)
 2012-11-12 23:25:04 +00:00
Gavin Andresen
8b11b682f1 No need for test fixture now that multisig is enabled on main network. 2012-11-12 22:59:36 +00:00
Gregory Maxwell
2857d51fea Fixes a race condition in CreateNewBlock and a future null deref on testnet. 
CreateNewBlock was reading pindexBest at the start before taking the lock
so it was possible to have the the block content not match the prevheader
and this can also trigger a newly added assert in ConnectBlock.

I noticed this during a code review after twobitcoins reported that ab91bf39
(BIP30 for all blocks) could cause a null dereference on a modified node
that mined during the IBD, or on testnet when it reached heights 91842 and
91880 due to CreateNewBlock calling ConnectBlock with pindex->phashBlock NULL.
 2012-11-12 22:47:09 +00:00
Gregory Maxwell
2d2e5bdcf4 Fixes a race condition in CreateNewBlock. 
CreateNewBlock was reading pindexBest at the start before taking the lock
so it was possible to have the the block content not match the prevheader.

(Partial of faff50d129)
 2012-11-12 22:44:29 +00:00
Wladimir J. van der Laan
3e72516398 Fix out-of-bounds read noticed by Ricardo Correia 
Sizeof() returned the size of a pointer instead of the size of the buffer.
Fixes issue #1924.
 2012-11-12 22:28:47 +00:00
Philip Kaufmann
207260d0c7 ensure AskPassphraseDialog::eventFilter forwards events 
- instead of "return false;" use "return QDialog::eventFilter(object,
  event);" to harmonize this event filter with our default behaviour

(partial of 83a3fb81f3)
 2012-11-12 22:16:53 +00:00
Alex
71f7ccf1ec Fixed 100% CPU utilization problem on FreeBSD 9 2012-11-12 22:05:15 +00:00
Jeff Garzik
12f341d253 CAddrMan: verify pchMessageStart file marker, before reading address data 
This avoids the case where you read the address data, before noticing it is
the wrong network.
 2012-10-20 23:31:30 +00:00
Wladimir J. van der Laan
49524859ca Fix a use-after-free problem in initialization (#1920) 
Don't store the result of c_str().

Luckily, this only affects logging, though it could crash or leak
sensitive data to the log in rare cases.
 2012-10-20 23:29:07 +00:00
Luke Dashjr
f9459ef914 Merge branch '0.6.x' into 0.7.x 
Conflicts:
	src/bitcoinrpc.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-20 23:28:14 +00:00
Luke Dashjr
8a17087795 Tree-Merge branch '0.6.x' into 0.7.x 
Conflicts:
	bitcoin-qt.pro
	contrib/debian/patches/1001_use_system_json-spirit.patch
	doc/README
	doc/README_windows.txt
	doc/build-osx.txt
	doc/build-unix.txt
	doc/readme-qt.rst
	share/setup.nsi
	src/addrman.cpp
	src/bitcoinrpc.cpp
	src/checkpoints.cpp
	src/crypter.cpp
	src/db.cpp
	src/db.h
	src/init.cpp
	src/init.h
	src/irc.cpp
	src/key.cpp
	src/key.h
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/makefile.mingw
	src/makefile.unix
	src/net.cpp
	src/net.h
	src/qt/addressbookpage.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoinaddressvalidator.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/forms/overviewpage.ui
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
	src/qt/optionsdialog.cpp
	src/qt/optionsmodel.h
	src/qt/overviewpage.cpp
	src/qt/overviewpage.h
	src/qt/sendcoinsdialog.cpp
	src/qt/transactiondesc.cpp
	src/qt/transactiontablemodel.h
	src/qt/walletmodel.cpp
	src/script.cpp
	src/test/DoS_tests.cpp
	src/util.cpp
	src/util.h
	src/version.h
	src/walletdb.cpp
 2012-10-20 23:26:08 +00:00
Luke Dashjr
37be168579 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:23:33 +00:00
Luke Dashjr
747b688b54 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:18:01 +00:00
Luke Dashjr
f9d1d13855 Update supported translations 2012-10-15 18:16:24 +00:00
Luke Dashjr
a9f8791388 Merge branch '0.6.0.x' into 0.6.x 2012-10-15 18:14:15 +00:00
Luke Dashjr
c87919696d Merge branch '0.5.x' into 0.6.0.x 2012-10-15 18:14:05 +00:00