From 3b723377d9660586adc1be65d03bb7bc1721f6cd Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Mon, 24 Aug 2015 22:08:57 +0200 Subject: [PATCH 1/1] Updated public software signing key. --- res/Tools_Misc_A.qrc | 2 +- res/tools/gpgv.gpg | Bin 1695 -> 0 bytes res/tools/keyring.gpg | Bin 0 -> 2240 bytes src/Config.h | 2 +- src/Dialog_Update.cpp | 2 +- src/Tools.h | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 res/tools/gpgv.gpg create mode 100644 res/tools/keyring.gpg diff --git a/res/Tools_Misc_A.qrc b/res/Tools_Misc_A.qrc index 4bd5185b..8479c547 100644 --- a/res/Tools_Misc_A.qrc +++ b/res/Tools_Misc_A.qrc @@ -3,7 +3,7 @@ tools/elevator.exe tools/gpgv.exe - tools/gpgv.gpg + tools/keyring.gpg tools/sox.exe tools/tag.exe tools/wget.exe diff --git a/res/tools/gpgv.gpg b/res/tools/gpgv.gpg deleted file mode 100644 index 8ac5f57745e42fca95a34481145fc2b492a16f5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1695 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 O#n!W{r^7?A0ssSUAw5+9 literal 0 HcmV?d00001 diff --git a/src/Config.h b/src/Config.h index 59e4bc02..6317ee99 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 1787 +#define VER_LAMEXP_BUILD 1790 #define VER_LAMEXP_CONFG 1700 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Dialog_Update.cpp b/src/Dialog_Update.cpp index 6558cdbc..24fd7e62 100644 --- a/src/Dialog_Update.cpp +++ b/src/Dialog_Update.cpp @@ -85,7 +85,7 @@ UpdateDialog::UpdateDialog(const SettingsModel *const settings, QWidget *parent) m_binaryUpdater(lamexp_tools_lookup("wupdate.exe")), m_binaryWGet(lamexp_tools_lookup("wget.exe")), m_binaryGnuPG(lamexp_tools_lookup("gpgv.exe")), - m_binaryKeys(lamexp_tools_lookup("gpgv.gpg")) + m_binaryKeys(lamexp_tools_lookup("keyring.gpg")) { if(m_binaryUpdater.isEmpty()) { diff --git a/src/Tools.h b/src/Tools.h index 9b9044e2..0f7044b9 100644 --- a/src/Tools.h +++ b/src/Tools.h @@ -67,7 +67,7 @@ g_lamexp_tools[] = {"36f9b021a8136664fce4c556571270f9151ca11d191b31630b0cad7b28107be2175909b8d28c903cb1c17d260c38d5de", CPU_TYPE_X86_ALL, "flac.i386.exe", 131, ""}, {"68e08fc34f981d183f243308791b5e158c28903a2052ca239bb9ad3d54d976c9ec7f0bb0b50c0aadfcefb4a1d0f63a18", CPU_TYPE_X64_ALL, "flac.x64.exe" , 131, ""}, {"9d2008d06b731b0d88377e9b2ceda30826ee787fe09ae8ef98084d5ef80655199e5069672366314b67a4285b56a282f0", CPU_TYPE_ALL_ALL, "gpgv.exe", 1419, ""}, - {"19c9dbe9089491c1f59ae48016d95d4336c4d3743577db4e782d8b59eca3b2bda6ed8f92f9004f88f434935b79e4974b", CPU_TYPE_ALL_ALL, "gpgv.gpg", UINT_MAX, ""}, + {"c66992384b6388a7b68f2659624c150b33ff1cacb0c28c0ab2a3249eca4c31e204953f325403f78c077d1735b275ac12", CPU_TYPE_ALL_ALL, "keyring.gpg", UINT_MAX, ""}, {"53cfab3896a47d48f523315f475fa07856d468ad1aefcc8cce19c18cdf509e2f92840dab92a442995df36d941cb7a6ca", CPU_TYPE_ALL_GEN, "lame.i386.exe", 3995, "Final"}, {"9511e7ef2ad10de05386eedf7f14d637edab894a53dacd2f8f15c6f8ed582f12c25fb5bf88438e62c46b8eb92e7634b2", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3995, "Final"}, {"fdbeb978025b9a5345300f37bb56446c31c7db594cf29407afdcc9ce20f4a5cec6eb8c03962c247d4f45b83c465ac705", CPU_TYPE_ALL_ALL, "mac.exe", 412, ""}, -- 2.11.0