Commit Graph
3805 Commits
Author SHA1 Message Date
Pieter WuilleandLuke Dashjr 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 KaufmannandLuke Dashjr 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 KaufmannandLuke Dashjr 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 KaufmannandLuke Dashjr 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 KaufmannandLuke Dashjr deb9f100a0 fix some double-spaces in strings
(partial of 6b3783a9c9)
2012-11-12 23:32:44 +00:00
Philip KaufmannandLuke Dashjr caeafd1bd1 fix some double-spaces in strings
(partial of 6b3783a9c9)
2012-11-12 23:25:04 +00:00
Gavin AndresenandLuke Dashjr 8b11b682f1 No need for test fixture now that multisig is enabled on main network. 2012-11-12 22:59:36 +00:00
Gregory MaxwellandLuke Dashjr 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 MaxwellandLuke Dashjr 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 LaanandLuke Dashjr 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 KaufmannandLuke Dashjr 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
AlexandLuke Dashjr 71f7ccf1ec Fixed 100% CPU utilization problem on FreeBSD 9 2012-11-12 22:05:15 +00:00
Jeff GarzikandLuke Dashjr 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 LaanandLuke Dashjr 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
Philip KaufmannandLuke Dashjr 8365992f90 fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cpp
- also includes the required bitcoinstrings.cpp update
2012-10-15 14:57:10 +00:00
Luke Dashjr 5dc6be8bba Merge branch '0.6.0.x' into 0.6.x
Conflicts:
	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-09 23:45:19 +00:00
Luke Dashjr 38297ba90a Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	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_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
2012-10-09 23:40:25 +00:00
Luke Dashjr 6ec7ac15ff Update supported translations 2012-10-09 23:28:53 +00:00
Luke Dashjr 3241935774 Merge branch '0.6.0.x' into 0.6.x 2012-10-09 23:17:49 +00:00
Luke Dashjr 4cf9b4c6fa Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	src/qt/transactiondesc.cpp
2012-10-09 23:17:43 +00:00
Luke Dashjr cef36fad89 Merge branch '0.4.x' into 0.5.x
Conflicts:
	src/bitcoinrpc.cpp
	src/init.cpp
2012-10-09 23:16:24 +00:00
Gavin AndresenandLuke Dashjr b3f8f6ab94 Avoid crashes at shutdown due to printf() in global destructors. 2012-10-09 23:12:50 +00:00
Wladimir J. van der LaanandLuke Dashjr d37a2fd808 Send --help message to stdout i.s.o stderr
This allows fun stuff such as `bitcoin --help | less`, and more
easy piping to files.

Looking at other tools such as bash, gcc, they all send their help
text to stdout.
2012-10-09 23:04:59 +00:00
Wladimir J. van der LaanandLuke Dashjr 638cecee77 When datadir missing, show messagebox instead of printing error to stderr 2012-10-09 23:01:16 +00:00
Rune K. SvendsenandLuke Dashjr a7642282f6 When encrypting the wallet, warn user that old backups will become useless.
Don't include HTML in translation strings. Do split the huge message over several lines.

Prettier lines
2012-10-09 22:57:34 +00:00
kjj2andLuke Dashjr bced903ae5 Add a backup warning to the encryptwallet RPC command 2012-10-09 22:57:11 +00:00
Philip KaufmannandLuke Dashjr 135bee074d Windows: fix URI association setting in registry
- fix for #1877
- fix was reported to work via
  https://bitcointalk.org/index.php?topic=110243.msg1230418#msg1230418
2012-10-09 22:55:28 +00:00
xanatosandLuke Dashjr cc57473222 toHTML won't add empty wtx.mapValue elements
As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness.

Removed a duplicated identical if

There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-10-09 22:52:35 +00:00
Philip KaufmannandLuke Dashjr 6a9a280ec7 change last occurance of mac to macx in Qt project-file 2012-10-09 22:38:28 +00:00
Gavin AndresenandLuke Dashjr d1b7590911 Compile/link Bitcoin-Qt.app with -pthread 2012-10-09 22:30:01 +00:00
Philip KaufmannandLuke Dashjr 207ef3008c additional fix for #1843
- a shortcut on "receive coins" was used twice
2012-10-09 22:22:07 +00:00
fanquakeandLuke Dashjr e25f0f0e53 Update Bugreport Links
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
2012-10-09 18:18:21 +00:00
fanquakeandLuke Dashjr 599ec1e115 Update Bugreport Links
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
2012-10-09 18:17:31 +00:00
Philip KaufmannandLuke Dashjr 9769d14f03 Change hotkey for "Send" button to "e" since "S" is already used for "Settings" menu
Partial of upstream da9413d913
2012-10-09 18:13:58 +00:00
Gavin AndresenandLuke Dashjr 3d6adbe71a Update gitignore and Makefiles for build.h move from src/ to src/obj 2012-10-09 18:07:44 +00:00