diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2021-08-22 08:38:57 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-08-22 08:51:02 +0000 |
| commit | 1a8f509f6d4073363b5a39a8da581e05dec4834c (patch) | |
| tree | 8936c740a279de0ee24b07fada5e0f2f68f49fd9 /www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc | |
| parent | f302216145c10a30b4d11951a1611cb7725b8297 (diff) | |
| download | ports-1a8f509f6d4073363b5a39a8da581e05dec4834c.tar.gz ports-1a8f509f6d4073363b5a39a8da581e05dec4834c.zip | |
www/chromium: update to 92.0.4515.159
Mark broken on i386 for now, it does not compile there because of a
ssize_t * vs off_t * mismatch.
MFH: 2021Q3
Security: https://vuxml.freebsd.org/freebsd/128deba6-ff56-11eb-8514-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/c3c6c4a3-f47d-11eb-b632-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/76487640-ea29-11eb-a686-3065ec8fd3ec.html
(cherry picked from commit 76daa653245e62b0f8e07ef4899c0a5bb176b3da)
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc new file mode 100644 index 000000000000..94294223caaf --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc @@ -0,0 +1,70 @@ +--- chrome/browser/enterprise/connectors/device_trust/attestation_service.cc.orig 2021-07-28 07:35:48 UTC ++++ chrome/browser/enterprise/connectors/device_trust/attestation_service.cc +@@ -18,10 +18,10 @@ + namespace enterprise_connectors { + + AttestationService::AttestationService() { +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + key_pair_ = std::make_unique<enterprise_connectors::DeviceTrustKeyPair>(); + key_pair_->Init(); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + } + + AttestationService::~AttestationService() = default; +@@ -71,11 +71,11 @@ std::string AttestationService::ProtobufChallengeToJso + base::Base64Encode(challenge_response, &encoded); + signed_data.SetKey("data", base::Value(encoded)); + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + std::string signature; + key_pair_->GetSignatureInBase64(challenge_response, &signature); + signed_data.SetKey("signature", base::Value(signature)); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + base::Value dict(base::Value::Type::DICTIONARY); + dict.SetKey("challengeResponse", std::move(signed_data)); +@@ -85,11 +85,11 @@ std::string AttestationService::ProtobufChallengeToJso + return json; + } + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + std::string AttestationService::ExportPEMPublicKey() { + return key_pair_->ExportPEMPublicKey(); + } +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + void AttestationService::SignEnterpriseChallenge( + const SignEnterpriseChallengeRequest& request, +@@ -110,9 +110,9 @@ void AttestationService::SignEnterpriseChallengeTask( + + KeyInfo key_info; + // Set the public key so VA can verify the client. +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + key_info.set_signed_public_key_and_challenge(ExportPEMPublicKey()); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + ChallengeResponse response_pb; + *response_pb.mutable_challenge() = signed_challenge; +@@ -135,12 +135,12 @@ void AttestationService::SignEnterpriseChallengeTask( + bool AttestationService::SignChallengeData(const std::string& data, + std::string* response) { + std::string signature; +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + if (!key_pair_->GetSignatureInBase64(data, &signature)) { + LOG(ERROR) << __func__ << ": Failed to sign data."; + return false; + } +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + SignedData signed_data; + signed_data.set_data(data); + signed_data.set_signature(signature); |