Commit Graph

2401 Commits

Author SHA1 Message Date
Luke Dashjr
06f4e33677 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:36:38 +00:00
Luke Dashjr
4fb6e53968 Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	doc/unit-tests.txt
2012-08-12 17:35:44 +00:00
Luke Dashjr
566f556c40 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:34:23 +00:00
Luke Dashjr
8ddc257a4b Merge branch '0.4.x' into 0.5.x 2012-08-12 17:33:03 +00:00
Luke Dashjr
448f6b3d9b Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:30:36 +00:00
Luke Dashjr
8911ac0b27 Bugfix: Use standard BTC unit in comments 2012-08-12 17:27:46 +00:00
Luke Dashjr
3171daef6c Bugfix: Fix a variety of misspellings 2012-08-12 17:22:48 +00:00
Luke Dashjr
cafa8f2879 Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
2012-08-12 17:19:48 +00:00
Luke Dashjr
89c5c381b7 Merge branch '0.5.x' into 0.6.0.x 2012-08-12 17:14:29 +00:00
Luke Dashjr
982f4fd301 Bugfix: Fix a variety of misspellings 2012-08-12 17:13:48 +00:00
Luke Dashjr
797d0b231b Merge branch '0.4.x' into 0.5.x
Conflicts:
	src/net.cpp
2012-08-12 17:02:38 +00:00
Luke Dashjr
9e98fe6f58 Bugfix: Fix a variety of misspellings
(PARTIAL: Left out anything changing debug.log)
2012-08-12 17:00:02 +00:00
Luke Dashjr
5951d9fe32 Merge branch 'bugfix_CNBerr' into 0.5.x 2012-08-12 16:40:59 +00:00
Luke Dashjr
9b1b1a06a1 Merge branch '0.4.x' into 0.5.x 2012-08-12 16:39:46 +00:00
Luke Dashjr
ae8ccfd24b Merge branch 'bugfix_CNBerr_daggy' into 0.4.x 2012-08-12 16:39:03 +00:00
Michael Ford
7543a5611b Typo 2012-07-26 03:37:12 +00:00
Stephane Glondu
0a9972bf1b Fix spelling of successfully 2012-07-26 00:41:56 +00:00
fanquake
895191b9a8 Typo 2012-07-26 00:39:46 +00:00
fanquake
b8dcb38b4e Fix Typo 2012-07-26 00:39:21 +00:00
fanquake
fb4dbbd188 Docs Tidy up
(PARTIAL cherry pick)
2012-07-22 23:38:26 +00:00
Luke Dashjr
ff4be740b5 Merge branch '0.5.x' into 0.6.0.x 2012-07-22 23:15:38 +00:00
Luke Dashjr
4f620dd0f0 Merge branch '0.4.x' into 0.5.x 2012-07-22 23:15:22 +00:00
Philip Kaufmann
ec9a3c04ed fix OpenSSL not written as proper noun in some comments 2012-07-22 22:09:49 +00:00
Philip Kaufmann
222ac2b12a re-size addressbookpage.ui to fix #1062 2012-07-22 22:08:49 +00:00
fanquake
5dc6e7067c Update a link 2012-07-22 21:52:41 +00:00
Rune K. Svendsen
63f319353c Let the comment in GetBlockValue() reflect the uncertainty about the time interval between subsidy reductions 2012-07-22 21:45:32 +00:00
Wladimir J. van der Laan
b2848bf08a Make sort and filters for transactions and labels case-insensitive 2012-07-22 21:45:04 +00:00
Philip Kaufmann
bb583e3c11 when on testnet, set testnet icon for about dialog
- add a comment
2012-07-22 21:18:48 +00:00
Luke Dashjr
7a161e4847 CBigNum: Convert negative int64 values in a more well-defined way
Since the minimum signed integer cannot be represented as positive so long as its type is signed, and it's not well-defined what happens if you make it unsigned before negating it, we instead increment the negative integer by 1, convert it, then increment the (now positive) unsigned integer by 1 to compensate
2012-07-22 21:10:19 +00:00
Ricardo M. Correia
3bd1d6645e Fix signed subtraction overflow in CBigNum::setint64().
As noticed by sipa (Pieter Wuille), this can happen when CBigNum::setint64() is
called with an integer value of INT64_MIN (-2^63).

When compiled with -ftrapv, the program would crash. Otherwise, it would
execute an undefined operation (although in practice, usually the correct one).
2012-07-22 21:10:15 +00:00
Philip Kaufmann
7bf9a64538 fix typo in optionsmodel.cpp 2012-07-08 14:54:57 +00:00
Luke Dashjr
7083cc3083 Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/net.cpp
2012-07-06 00:42:53 +00:00
Luke Dashjr
f1830a9a22 Merge branch '0.4.x' into 0.5.x 2012-07-06 00:41:57 +00:00
Gregory Maxwell
927c00255b Do not consider inbound peers for outbound network group exclusion.
Bitcoin will not make an outbound connection to a network group
(/16 for IPv4) that it is already connected to. This means that
if an attacker wants good odds of capturing all a nodes outbound
connections he must have hosts on a a large number of distinct
groups.

Previously both inbound and outbound connections were used to
feed this exclusion. The use of inbound connections, which can be
controlled by the attacker, actually has the potential of making
sibyl attacks _easier_: An attacker can start up hosts in groups
which house many honest nodes and make outbound connections to
the victim to exclude big swaths of honest nodes. Because the
attacker chooses to make the outbound connection he can always
beat out honest nodes for the consumption of inbound slots.

At _best_ the old behavior increases attacker costs by a single
group (e.g. one distinct group to use to fill up all your inbound
slots), but at worst it allows the attacker to select whole
networks you won't connect to.

This commit makes the nodes use only outbound links to exclude
network groups for outbound connections. Fancier things could
be done, like weaker exclusion for inbound groups... but
simplicity is good and I don't believe more complexity is
currently needed.
2012-07-06 00:29:56 +00:00
Gregory Maxwell
580f7cd731 Do not consider inbound peers for outbound network group exclusion.
Bitcoin will not make an outbound connection to a network group
(/16 for IPv4) that it is already connected to. This means that
if an attacker wants good odds of capturing all a nodes outbound
connections he must have hosts on a a large number of distinct
groups.

Previously both inbound and outbound connections were used to
feed this exclusion. The use of inbound connections, which can be
controlled by the attacker, actually has the potential of making
sibyl attacks _easier_: An attacker can start up hosts in groups
which house many honest nodes and make outbound connections to
the victim to exclude big swaths of honest nodes. Because the
attacker chooses to make the outbound connection he can always
beat out honest nodes for the consumption of inbound slots.

At _best_ the old behavior increases attacker costs by a single
group (e.g. one distinct group to use to fill up all your inbound
slots), but at worst it allows the attacker to select whole
networks you won't connect to.

This commit makes the nodes use only outbound links to exclude
network groups for outbound connections. Fancier things could
be done, like weaker exclusion for inbound groups... but
simplicity is good and I don't believe more complexity is
currently needed.
2012-07-06 00:28:30 +00:00
fanquake
fb7ca33178 Fix a couple more typos 2012-07-06 00:22:05 +00:00
fanquake
cf6ab20d8b Fix a couple more typos 2012-07-06 00:21:18 +00:00
Philip Kaufmann
a1816267e6 fix a typo in OptionsDialog 2012-07-06 00:17:23 +00:00
fanquake
d477028247 Fix a few typos 2012-07-05 23:54:49 +00:00
fanquake
46761b339c Fix a few typos 2012-07-05 23:54:41 +00:00
fanquake
26199789ed Fix a few typos 2012-07-05 23:54:32 +00:00
xanatos
ee29ad27b3 Changed a comment about a QVariant type 2012-07-05 23:49:32 +00:00
xanatos
19920202cc Small fix to rpc_tests 2012-07-05 23:48:49 +00:00
Philip Kaufmann
46dbdebb59 small updates to Bitcoin-Qt project file
- re-word a comment and remove a space
2012-07-05 23:20:36 +00:00
Luke Dashjr
a0cbcfd6ed Update Debian "Use system json-spirit" patch to apply
("Fixed" upstream in 3563824c60)
2012-07-05 23:14:20 +00:00
Luke Dashjr
ccf2e853a1 Update Debian "Use system json-spirit" patch to apply
("Fixed" upstream in 3563824c60)
2012-07-05 23:13:43 +00:00
Michael Ford
04ae8e1a1b Update master 2012-07-05 23:01:52 +00:00
Philip Kaufmann
971a6e53a1 fix a comment to correctly use -upgradewallet 2012-07-05 23:00:05 +00:00
Philip Kaufmann
04d4c0e444 fix a memory leak in key.cpp
- add EC_KEY_free() in CKey::Reset() when pkey != NULL
- init pkey with NULL in CKey constructor
2012-07-05 22:56:10 +00:00
Luke Dashjr
3edb53eeed gitian-downloader: Update luke-jr's key 2012-07-05 22:50:53 +00:00