diff options
| author | Sam Bingner <sam@bingner.com> | 2018-12-26 15:34:06 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-12-26 15:35:01 -1000 |
| commit | 9d801c75cdf8e48a8013257c684c7702806dde6c (patch) | |
| tree | b9321de82a963b64f8e88081737cd182ea059e29 /methods | |
| parent | 59c3e0b998fd69532159d8dc416109cf50651482 (diff) | |
| parent | f05c3233c311d40bb9f2ef65888aa7ce574a334b (diff) | |
Merge bingner.com:apt1.4.8+iPhone-1
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/gpgv.cc | 2 | ||||
| -rw-r--r-- | methods/http.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 51c268d02..83135c220 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -67,7 +67,7 @@ struct Digest { static constexpr Digest Digests[] = { {Digest::State::Untrusted, "Invalid digest"}, {Digest::State::Untrusted, "MD5"}, - {Digest::State::Untrusted, "SHA1"}, + {Digest::State::Trusted, "SHA1"}, {Digest::State::Untrusted, "RIPE-MD/160"}, {Digest::State::Trusted, "Reserved digest"}, {Digest::State::Trusted, "Reserved digest"}, diff --git a/methods/http.cc b/methods/http.cc index 72e813cb9..9549b23ac 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -599,7 +599,7 @@ int main(int, const char *argv[]) if (UniqueID_ == NULL) if (void *lockdown = lockdown_connect()) { - UniqueID_ = lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey); + UniqueID_ = (CFStringRef)lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey); lockdown_disconnect(lockdown); } |