From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 14 Jan 2013 05:31:51 +0000 (+0100)
Subject: ensure sha512 is really used when available (thanks to Tyler Hicks )
X-Git-Tag: 0.9.8~42^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ee5f5d257c6ad59c9b3ef8c55d61ffb293be847c?ds=sidebyside

ensure sha512 is really used when available (thanks to Tyler Hicks )
---

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a30e98858..a71886a87 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1730,7 +1730,7 @@ bool pkgAcqArchive::QueueNext()
       {
 	 if(stringcasecmp(ForceHash, "sha512") == 0)
 	    ExpectedHash = HashString("SHA512", Parse.SHA512Hash());
-	 if(stringcasecmp(ForceHash, "sha256") == 0)
+	 else if(stringcasecmp(ForceHash, "sha256") == 0)
 	    ExpectedHash = HashString("SHA256", Parse.SHA256Hash());
 	 else if (stringcasecmp(ForceHash, "sha1") == 0)
 	    ExpectedHash = HashString("SHA1", Parse.SHA1Hash());
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 1bb981b20..e3c74a099 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2395,7 +2395,7 @@ bool DoDownload(CommandLine &CmdL)
       HashString hash;
       if (rec.SHA512Hash() != "")
          hash = HashString("sha512", rec.SHA512Hash());
-      if (rec.SHA256Hash() != "")
+      else if (rec.SHA256Hash() != "")
          hash = HashString("sha256", rec.SHA256Hash());
       else if (rec.SHA1Hash() != "")
          hash = HashString("sha1", rec.SHA1Hash());