Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea8d7b84 authored by Wayne Ma's avatar Wayne Ma Committed by android-build-merger
Browse files

Merge "resolv: add missing tlsServers and tlsFingerprints in log" am: 4b0f40fa5f

am: 33741b7796

Change-Id: Iafeee084053c2be4c988a40ecb5b89aa27bd3262
parents 19886971 eafd9e49
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ static std::vector<uint8_t> parseBase64(const std::string& input) {
                    .args(resolverParams.netId, resolverParams.servers, resolverParams.domains,
                          resolverParams.sampleValiditySeconds, resolverParams.successThreshold,
                          resolverParams.minSamples, resolverParams.maxSamples,
                          resolverParams.baseTimeoutMsec, resolverParams.retryCount);
                          resolverParams.baseTimeoutMsec, resolverParams.retryCount,
                          resolverParams.tlsServers, resolverParams.tlsFingerprints);

    std::set<std::vector<uint8_t>> decoded_fingerprints;
    for (const std::string& fingerprint : resolverParams.tlsFingerprints) {