X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b1bdfe682054ea6fc202416968c5342d59b403b1..5da51e0e2da3f055306562d38103b06a23d81719:/apt-pkg/acquire-item.cc?ds=sidebyside

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 04ba2b479..63b3c9a1f 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -731,9 +731,11 @@ void pkgAcquire::Item::Failed(string const &Message,pkgAcquire::MethodConfig con
    }
 
    string const FailReason = LookupTag(Message, "FailReason");
-   enum { MAXIMUM_SIZE_EXCEEDED, HASHSUM_MISMATCH, OTHER } failreason = OTHER;
+   enum { MAXIMUM_SIZE_EXCEEDED, HASHSUM_MISMATCH, WEAK_HASHSUMS, OTHER } failreason = OTHER;
    if ( FailReason == "MaximumSizeExceeded")
       failreason = MAXIMUM_SIZE_EXCEEDED;
+   else if ( FailReason == "WeakHashSums")
+      failreason = WEAK_HASHSUMS;
    else if (Status == StatAuthError)
       failreason = HASHSUM_MISMATCH;
 
@@ -747,6 +749,9 @@ void pkgAcquire::Item::Failed(string const &Message,pkgAcquire::MethodConfig con
 	    case HASHSUM_MISMATCH:
 	       out << _("Hash Sum mismatch") << std::endl;
 	       break;
+	    case WEAK_HASHSUMS:
+	       out << _("Insufficient information available to perform this download securely") << std::endl;
+	       break;
 	    case MAXIMUM_SIZE_EXCEEDED:
 	    case OTHER:
 	       out << LookupTag(Message, "Message") << std::endl;
@@ -757,7 +762,12 @@ void pkgAcquire::Item::Failed(string const &Message,pkgAcquire::MethodConfig con
 	 {
 	    out << "Hashes of expected file:" << std::endl;
 	    for (auto const &hs: ExpectedHashes)
-	       out << " - " << hs.toStr() << std::endl;
+	    {
+	       out << " - " << hs.toStr();
+	       if (hs.usable() == false)
+		  out << " [weak]";
+	       out << std::endl;
+	    }
 	 }
 	 if (failreason == HASHSUM_MISMATCH)
 	 {
@@ -767,7 +777,13 @@ void pkgAcquire::Item::Failed(string const &Message,pkgAcquire::MethodConfig con
 	       std::string const tagname = std::string(*type) + "-Hash";
 	       std::string const hashsum = LookupTag(Message, tagname.c_str());
 	       if (hashsum.empty() == false)
-		  out << " - " << HashString(*type, hashsum).toStr() << std::endl;
+	       {
+		  auto const hs = HashString(*type, hashsum);
+		  out << " - " << hs.toStr();
+		  if (hs.usable() == false)
+		     out << " [weak]";
+		  out << std::endl;
+	       }
 	    }
 	    out << "Last modification reported: " << LookupTag(Message, "Last-Modified", "<none>") << std::endl;
 	 }
@@ -781,6 +797,7 @@ void pkgAcquire::Item::Failed(string const &Message,pkgAcquire::MethodConfig con
    {
       case MAXIMUM_SIZE_EXCEEDED: RenameOnError(MaximumSizeExceeded); break;
       case HASHSUM_MISMATCH: RenameOnError(HashSumMismatch); break;
+      case WEAK_HASHSUMS: break;
       case OTHER: break;
    }