aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-14Merge branch '0.6.x' into 0.7.xLuke Dashjr
Conflicts: src/bitcoinrpc.cpp src/crypter.h src/main.cpp src/qt/bitcoin.cpp src/qt/qtipcserver.cpp src/util.cpp
2012-11-14Merge branch '0.6.0.x' into 0.6.xLuke Dashjr
Conflicts: src/init.cpp src/main.cpp src/serialize.h
2012-11-14Merge branch '0.5.x' into 0.6.0.xLuke Dashjr
2012-11-14Merge branch '0.4.x' into 0.5.xLuke Dashjr
Conflicts: src/bitcoinrpc.cpp
2012-11-12don't use memset() in privacy/security relevant code partsPhilip Kaufmann
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-12don't use memset() in privacy/security relevant code partsPhilip Kaufmann
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-12Qt: small header changes / fixesPhilip Kaufmann
- 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-12fix some double-spaces in stringsPhilip Kaufmann
(partial of 6b3783a9c9cc47afcf72aa0a86ea26122392efdb)
2012-11-12fix some double-spaces in stringsPhilip Kaufmann
(partial of 6b3783a9c9cc47afcf72aa0a86ea26122392efdb)
2012-11-12No need for test fixture now that multisig is enabled on main network.Gavin Andresen
2012-11-12Fixes a race condition in CreateNewBlock and a future null deref on testnet.Gregory Maxwell
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-12Fixes a race condition in CreateNewBlock.Gregory Maxwell
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 faff50d129b6d4b9e6397ac989218e83a26ae692)
2012-11-12Fix out-of-bounds read noticed by Ricardo CorreiaWladimir J. van der Laan
Sizeof() returned the size of a pointer instead of the size of the buffer. Fixes issue #1924.
2012-11-12ensure AskPassphraseDialog::eventFilter forwards eventsPhilip Kaufmann
- instead of "return false;" use "return QDialog::eventFilter(object, event);" to harmonize this event filter with our default behaviour (partial of 83a3fb81f3da38461457e8dcdf5baf27b662a4b3)
2012-11-12Fixed 100% CPU utilization problem on FreeBSD 9Alex
2012-10-20CAddrMan: verify pchMessageStart file marker, before reading address dataJeff Garzik
This avoids the case where you read the address data, before noticing it is the wrong network.
2012-10-20Fix a use-after-free problem in initialization (#1920)Wladimir J. van der Laan
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-20Merge branch '0.6.x' into 0.7.xLuke Dashjr
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-20Tree-Merge branch '0.6.x' into 0.7.xLuke Dashjr
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-15Merge branch '0.6.0.x' into 0.6.xLuke Dashjr
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-15Merge branch '0.5.x' into 0.6.0.xLuke Dashjr
Conflicts: src/qt/locale/bitcoin_es.ts src/qt/locale/bitcoin_zh_CN.ts
2012-10-15Update supported translationsLuke Dashjr
2012-10-15Merge branch '0.6.0.x' into 0.6.xLuke Dashjr
2012-10-15Merge branch '0.5.x' into 0.6.0.xLuke Dashjr
2012-10-15fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cppPhilip Kaufmann
- also includes the required bitcoinstrings.cpp update
2012-10-09Merge branch '0.6.0.x' into 0.6.xLuke Dashjr
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-09Merge branch '0.5.x' into 0.6.0.xLuke Dashjr
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-09Update supported translationsLuke Dashjr
2012-10-09Merge branch '0.6.0.x' into 0.6.xLuke Dashjr
2012-10-09Merge branch '0.5.x' into 0.6.0.xLuke Dashjr
Conflicts: src/qt/transactiondesc.cpp
2012-10-09Merge branch '0.4.x' into 0.5.xLuke Dashjr
Conflicts: src/bitcoinrpc.cpp src/init.cpp
2012-10-09Avoid crashes at shutdown due to printf() in global destructors.Gavin Andresen
2012-10-09Send --help message to stdout i.s.o stderrWladimir J. van der Laan
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-09When datadir missing, show messagebox instead of printing error to stderrWladimir J. van der Laan
2012-10-09When encrypting the wallet, warn user that old backups will become useless.Rune K. Svendsen
Don't include HTML in translation strings. Do split the huge message over several lines. Prettier lines
2012-10-09Add a backup warning to the encryptwallet RPC commandkjj2
2012-10-09Windows: fix URI association setting in registryPhilip Kaufmann
- fix for #1877 - fix was reported to work via https://bitcointalk.org/index.php?topic=110243.msg1230418#msg1230418
2012-10-09toHTML won't add empty wtx.mapValue elementsxanatos
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-09change last occurance of mac to macx in Qt project-filePhilip Kaufmann
2012-10-09Compile/link Bitcoin-Qt.app with -pthreadGavin Andresen
2012-10-09additional fix for #1843Philip Kaufmann
- a shortcut on "receive coins" was used twice
2012-10-09Update Bugreport Linksfanquake
Update Qt Links Revert Qt source link Update Qt links PARTIAL of e1eb3d4
2012-10-09Update Bugreport Linksfanquake
Update Qt Links Revert Qt source link Update Qt links PARTIAL of e1eb3d4
2012-10-09Change hotkey for "Send" button to "e" since "S" is already used for ↵Philip Kaufmann
"Settings" menu Partial of upstream da9413d9134a7534369a55422cadc3fdd91ba608
2012-10-09Update gitignore and Makefiles for build.h move from src/ to src/objGavin Andresen
2012-10-090.7.1 release notesv0.7.1rc1v0.7.1Gavin Andresen
2012-10-09Bump versions for 0.7.1 releaseGavin Andresen
2012-10-09Fix bad merge, pszDataDir duplicationGavin Andresen
2012-10-09Merge branch 'wallet_exceptions' of github.com:gavinandresen/bitcoin-gitGavin Andresen
2012-10-09Merge branch 'crash_at_exit' of github.com:gavinandresen/bitcoin-gitGavin Andresen