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

Commit 579ddc7b authored by Luke Huang's avatar Luke Huang
Browse files

Move SHA256_SIZE define to libnetdutils and stop including netd header 

Bug: 135235267
Test: m
      cd system/netd && atest
Change-Id: Ibe1dc22a2f3b762f10475e135613a9030bbe28b4
parent 9d2d25bc

Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ cc_library { 
    ],

    include_dirs: [

        "system/netd/include",

        "system/netd/server",

    ],

    export_include_dirs: ["include"],

    // TODO: pie in the sky: make this code clang-tidy clean
@@ -152,7 +151,6 @@ cc_test { 
    ],

    include_dirs: [

        "system/netd/resolv/include",

        "system/netd/server",

    ],

    shared_libs: [

        "libbase",

DnsResolverService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ 
#include <json/writer.h>

#include <log/log.h>

#include <netdutils/DumpWriter.h>

#include <netdutils/NetworkConstants.h>  // SHA256_SIZE

#include <openssl/base64.h>

#include <private/android_filesystem_config.h>  // AID_SYSTEM



#include "BinderUtil.h"

#include "DnsResolver.h"

#include "NetdConstants.h"    // SHA256_SIZE

#include "NetdPermissions.h"  // PERM_*

#include "ResolverEventReporter.h"

#include "resolv_cache.h"
@@ -186,7 +186,7 @@ static std::vector<uint8_t> parseBase64(const std::string& input) { 
    } else {

        decoded.clear();

    }

    if (out_len != SHA256_SIZE) {

    if (out_len != android::netdutils::SHA256_SIZE) {

        decoded.clear();

    }

    return decoded;

dns_responder/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ cc_library_static { 
        "netd_aidl_interface-V2-cpp",

    ],

    static_libs: ["libutils"],

    include_dirs: [

        "system/netd/server",

    ],

    srcs: [

        "dns_responder.cpp",

        "dns_responder_client.cpp",

dns_responder/dns_tls_frontend.cpp

+2 −3
Original line number Diff line number Diff line
@@ -30,10 +30,9 @@ 
#define LOG_TAG "DnsTlsFrontend"

#include <android-base/logging.h>

#include <netdutils/InternetAddresses.h>

#include <netdutils/NetworkConstants.h>  // SHA256_SIZE

#include <netdutils/SocketOption.h>



#include "NetdConstants.h"  // SHA256_SIZE



using android::netdutils::enableSockopt;

using android::netdutils::ScopedAddrinfo;
@@ -48,7 +47,7 @@ bool getSPKIDigest(const X509* cert, std::vector<uint8_t>* out) { 
        LOG(ERROR) << "SPKI length mismatch";

        return false;

    }

    out->resize(SHA256_SIZE);

    out->resize(android::netdutils::SHA256_SIZE);

    unsigned int digest_len = 0;

    int ret = EVP_Digest(spki, spki_len, out->data(), &digest_len, EVP_sha256(), nullptr);

    if (ret != 1) {

dnsresolver_binder_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
#include <binder/IServiceManager.h>

#include <gmock/gmock-matchers.h>

#include <gtest/gtest.h>

#include <netdutils/NetworkConstants.h>  // SHA256_SIZE

#include <netdutils/Stopwatch.h>

#include <openssl/base64.h>



#include "tests/dns_metrics_listener/base_metrics_listener.h"

#include "tests/dns_metrics_listener/test_metrics.h"



#include "NetdConstants.h"  // SHA256_SIZE

#include "ResolverStats.h"

#include "dns_responder.h"

#include "dns_responder_client.h"
@@ -251,9 +251,9 @@ TEST_F(DnsResolverBinderTest, RegisterEventListener_onDnsEvent) { 


TEST_F(DnsResolverBinderTest, SetResolverConfiguration_Tls) {

    const std::vector<std::string> LOCALLY_ASSIGNED_DNS{"8.8.8.8", "2001:4860:4860::8888"};

    std::vector<uint8_t> fp(SHA256_SIZE);

    std::vector<uint8_t> fp(android::netdutils::SHA256_SIZE);

    std::vector<uint8_t> short_fp(1);

    std::vector<uint8_t> long_fp(SHA256_SIZE + 1);

    std::vector<uint8_t> long_fp(android::netdutils::SHA256_SIZE + 1);

    std::vector<std::string> test_domains;

    std::vector<int> test_params = {300, 25, 8, 8};

    static const struct TestData {