diff options
| author | Peter Karlsson <peterk@debian.org> | 2007-10-08 11:44:54 +0100 |
|---|---|---|
| committer | Peter Karlsson <peterk@debian.org> | 2007-10-08 11:44:54 +0100 |
| commit | 21231056c2f4fb82730c0ac7e7f90456668cae38 (patch) | |
| tree | 1f9ca6a27065dce5014adea7095596ec6a8cb744 /apt-pkg/acquire-method.cc | |
| parent | 28b68bf4207be80d4549579f34262f1248a2e528 (diff) | |
| parent | 24401c09f0a826ec0074f46dfe70efe3aaf79f25 (diff) | |
Merge upstream.
Diffstat (limited to 'apt-pkg/acquire-method.cc')
| -rw-r--r-- | apt-pkg/acquire-method.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 3360a8eae..bc29417f7 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -176,9 +176,14 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) TimeRFC1123(Res.LastModified).c_str()); if (Res.MD5Sum.empty() == false) + { End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str()); + End += snprintf(End,sizeof(S)-50 - (End - S),"MD5Sum-Hash: %s\n",Res.MD5Sum.c_str()); + } if (Res.SHA1Sum.empty() == false) End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str()); + if (Res.SHA256Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"SHA256-Hash: %s\n",Res.SHA256Sum.c_str()); if (Res.GPGVOutput.size() > 0) End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n"); for (vector<string>::iterator I = Res.GPGVOutput.begin(); @@ -211,6 +216,9 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) if (Alt->SHA1Sum.empty() == false) End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA1-Hash: %s\n", Alt->SHA1Sum.c_str()); + if (Alt->SHA256Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA256-Hash: %s\n", + Alt->SHA256Sum.c_str()); if (Alt->IMSHit == true) strcat(End,"Alt-IMS-Hit: true\n"); @@ -455,5 +463,6 @@ void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash) { MD5Sum = Hash.MD5.Result(); SHA1Sum = Hash.SHA1.Result(); + SHA256Sum = Hash.SHA256.Result(); } /*}}}*/ |