Merge branch '0.4.x' into 0.5.x

Conflicts:
	contrib/Bitcoin.app/Contents/Info.plist
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h

6 files changed, 29 insertions, 7 deletions

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index d79e025fed..ec11b974ab 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET =
-VERSION = 0.5.6
+VERSION = 0.5.7
 INCLUDEPATH += src src/json src/qt
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB
 CONFIG += no_include_pwd
diff --git a/doc/README b/doc/README
index 5fd4171b9c..07e480e7a8 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.5.6 BETA
+Bitcoin 0.5.7 BETA
 
 Copyright (c) 2009-2012 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index fcb88bb473..bcb334b2fe 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.5.6 BETA

+Bitcoin 0.5.7 BETA

 

 Copyright (c) 2009-2012 Bitcoin Developers

 Distributed under the MIT/X11 software license, see the accompanying

diff --git a/share/setup.nsi b/share/setup.nsi
index 83be1e0764..6bde65ff2c 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 

 # General Symbol Definitions

 !define REGKEY "SOFTWARE\$(^Name)"

-!define VERSION 0.5.6

+!define VERSION 0.5.7

 !define COMPANY "Bitcoin project"

 !define URL http://www.bitcoin.org/

 

@@ -45,13 +45,13 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English

 

 # Installer attributes

-OutFile bitcoin-0.5.6-win32-setup.exe

+OutFile bitcoin-0.5.7-win32-setup.exe

 InstallDir $PROGRAMFILES\Bitcoin

 CRCCheck on

 XPStyle on

 BrandingText " "

 ShowInstDetails show

-VIProductVersion 0.5.6.0

+VIProductVersion 0.5.7.0

 VIAddVersionKey ProductName Bitcoin

 VIAddVersionKey ProductVersion "${VERSION}"

 VIAddVersionKey CompanyName "${COMPANY}"

diff --git a/src/main.cpp b/src/main.cpp
index cd9c8e5e49..b7d2398e95 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1994,6 +1994,28 @@ bool CAlert::ProcessAlert()
     if (!IsInEffect())
         return false;
 
+    // alert.nID=max is reserved for if the alert key is
+    // compromised. It must have a pre-defined message,
+    // must never expire, must apply to all versions,
+    // and must cancel all previous
+    // alerts or it will be ignored (so an attacker can't
+    // send an "everything is OK, don't panic" version that
+    // cannot be overridden):
+    int maxInt = std::numeric_limits<int>::max();
+    if (nID == maxInt)
+    {
+        if (!(
+                nExpiration == maxInt &&
+                nCancel == (maxInt-1) &&
+                nMinVer == 0 &&
+                nMaxVer == maxInt &&
+                setSubVer.empty() &&
+                nPriority == maxInt &&
+                strStatusBar == "URGENT: Alert key compromised, upgrade required"
+                ))
+            return false;
+    }
+
     CRITICAL_BLOCK(cs_mapAlerts)
     {
         // Cancel previous alerts
diff --git a/src/serialize.h b/src/serialize.h
index 3f4369be99..ed5c501353 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -60,7 +60,7 @@ class CDataStream;
 class CAutoFile;
 static const unsigned int MAX_SIZE = 0x02000000;
 
-static const int VERSION = 50603;
+static const int VERSION = 50700;
 static const char* pszSubVer = "";
 static const bool VERSION_IS_BETA = true;