diff options
| -rw-r--r-- | bitcoin-qt.pro | 6 | ||||
| -rw-r--r-- | src/init.cpp | 5 | ||||
| -rw-r--r-- | src/qt/res/bitcoin-qt.rc | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 5042adfbdf..bf41314052 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -30,10 +30,8 @@ contains(RELEASE, 1) { macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk !win32:!macx { - # Linux: static link + # Linux: static link and extra security (see: https://wiki.debian.org/Hardening) LIBS += -Wl,-Bstatic -Wl,-z,relro -Wl,-z,now - # for extra security (see: https://wiki.debian.org/Hardening) - QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2 } } @@ -44,6 +42,8 @@ contains(RELEASE, 1) { # Exclude on Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable! # This can be enabled for Windows, when we switch to MinGW >= 4.4.x. } +# for extra security (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific +QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2 # for extra security on Windows: enable ASLR and DEP via GCC linker flags win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat # on Windows: enable GCC large address aware linker flag diff --git a/src/init.cpp b/src/init.cpp index 5b8436651a..34443d81ac 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -608,7 +608,7 @@ bool AppInit2() // ********************************************************* Step 5: verify wallet database integrity - uiInterface.InitMessage(_("Verifying wallet integrity...")); + uiInterface.InitMessage(_("Verifying wallet...")); if (!bitdb.Open(GetDataDir())) { @@ -826,7 +826,7 @@ bool AppInit2() break; } - uiInterface.InitMessage(_("Verifying database...")); + uiInterface.InitMessage(_("Verifying blocks...")); if (!VerifyDB()) { strLoadError = _("Corrupted block database detected"); break; @@ -985,7 +985,6 @@ bool AppInit2() // ********************************************************* Step 9: import blocks // scan for better chains in the block chain database, that are not yet connected in the active best chain - uiInterface.InitMessage(_("Importing blocks from block database...")); CValidationState state; if (!ConnectBestBlock(state)) strErrors << "Failed to connect best block"; diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc index 834001c0c6..5449ff8359 100644 --- a/src/qt/res/bitcoin-qt.rc +++ b/src/qt/res/bitcoin-qt.rc @@ -22,7 +22,7 @@ BEGIN VALUE "FileDescription", "Bitcoin-Qt (OSS GUI client for Bitcoin)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoin-qt" - VALUE "LegalCopyright", "2009-2012 The Bitcoin developers" + VALUE "LegalCopyright", "2009-2013 The Bitcoin developers" VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." VALUE "OriginalFilename", "bitcoin-qt.exe" VALUE "ProductName", "Bitcoin-Qt" |