diff options
| author | Julian Andres Klode <jak@debian.org> | 2020-01-14 12:57:54 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2020-01-14 12:57:54 +0000 |
| commit | 5db3a38926aa820546c411dd9f49f57eea24cd9e (patch) | |
| tree | b794739c375d7c984c4190be44b9ed678e9bf0da /apt-pkg/contrib/cdromutl.cc | |
| parent | cfeae24843e8357c7e8d2ff3b23ee81cac330017 (diff) | |
| parent | 8c1a37e12790a23f3b132899485e011f9134b483 (diff) | |
Merge branch 'pu/gcrypt2' into 'master'
Use Libgcrypt for hashing purposes
See merge request apt-team/apt!89
Diffstat (limited to 'apt-pkg/contrib/cdromutl.cc')
| -rw-r--r-- | apt-pkg/contrib/cdromutl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 9db3980da..c0fe869d2 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -15,7 +15,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/md5.h> +#include <apt-pkg/hashes.h> #include <apt-pkg/strutl.h> #include <iostream> @@ -181,7 +181,7 @@ bool MountCdrom(string Path, string DeviceName) from effecting the outcome. */ bool IdentCdrom(string CD,string &Res,unsigned int Version) { - MD5Summation Hash; + Hashes Hash(Hashes::MD5SUM); bool writable_media = false; int dirfd = open(CD.c_str(), O_RDONLY | O_DIRECTORY | O_CLOEXEC); @@ -254,7 +254,7 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version) strprintf(S, "-%u.debug", Version); closedir(D); - Res = Hash.Result().Value().append(std::move(S)); + Res = Hash.GetHashString(Hashes::MD5SUM).HashValue().append(std::move(S)); return true; } /*}}}*/ |