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

Commit 2ec5688a authored by Yifan Hong's avatar Yifan Hong
Browse files

binder: X509 are serialized to vector<uint8_t> 

Change it from a string to a vector<uint8_t>. For DER
format, it is not a print-able string.

Test: pass
Bug: 198833574
Change-Id: I6b4d0ebc2d7429e927f7ca5abccc3f6aedfe1e6a
parent 180c2dae

libs/binder/RpcServer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ sp<IBinder> RpcServer::getRootObject() { 
    return ret;

}



std::string RpcServer::getCertificate(CertificateFormat format) {

std::vector<uint8_t> RpcServer::getCertificate(CertificateFormat format) {

    std::lock_guard<std::mutex> _l(mLock);

    return mCtx->getCertificate(format);

}

libs/binder/RpcSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ bool RpcSession::removeIncomingConnection(const sp<RpcConnection>& connection) { 
    return false;

}



std::string RpcSession::getCertificate(CertificateFormat format) {

std::vector<uint8_t> RpcSession::getCertificate(CertificateFormat format) {

    return mCtx->getCertificate(format);

}

libs/binder/RpcTransportRaw.cpp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public: 
    std::unique_ptr<RpcTransport> newTransport(android::base::unique_fd fd, FdTrigger*) const {

        return std::make_unique<RpcTransportRaw>(std::move(fd));

    }

    std::string getCertificate(CertificateFormat) const override { return {}; }

    std::vector<uint8_t> getCertificate(CertificateFormat) const override { return {}; }

};



} // namespace

libs/binder/RpcTransportTls.cpp

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ public: 
            std::shared_ptr<RpcCertificateVerifier> verifier);

    std::unique_ptr<RpcTransport> newTransport(android::base::unique_fd fd,

                                               FdTrigger* fdTrigger) const override;

    std::string getCertificate(CertificateFormat) const override;

    std::vector<uint8_t> getCertificate(CertificateFormat) const override;



protected:

    static ssl_verify_result_t sslCustomVerify(SSL* ssl, uint8_t* outAlert);
@@ -459,7 +459,7 @@ protected: 
    std::shared_ptr<RpcCertificateVerifier> mCertVerifier;

};



std::string RpcTransportCtxTls::getCertificate(CertificateFormat) const {

std::vector<uint8_t> RpcTransportCtxTls::getCertificate(CertificateFormat) const {

    // TODO(b/195166979): return certificate here

    return {};

}

libs/binder/include/binder/RpcServer.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public: 
    /**

     * See RpcTransportCtx::getCertificate

     */

    std::string getCertificate(CertificateFormat);

    std::vector<uint8_t> getCertificate(CertificateFormat);



    /**

     * Runs join() in a background thread. Immediately returns.