commit 9734cfc736b89134987b98e35210e304ca618b75
author Yifan Hong <elsk@google.com> Mon Sep 13 16:14:09 2021 -0700
committer Yifan Hong <elsk@google.com> Mon Sep 13 16:22:18 2021 -0700
tree 1337a7e264ff4ae350ac1af738d612dfb48f4766
parent 2c23db1413c82db2b1fea13ba9ad5bb1bfd0fedf

binder: CertificateFormat -> RpcCertificateFormat.

Fixes: 199553357
Test: TH

Change-Id: Ifaea4598f125ac5a8395ea30729a0059a792efbb

libs/binder/RpcCertificateUtils.cpp

diff --git a/libs/binder/RpcCertificateUtils.cpp b/libs/binder/RpcCertificateUtils.cpp
index 2aec2f6..d91736c 100644
--- a/libs/binder/RpcCertificateUtils.cpp
+++ b/libs/binder/RpcCertificateUtils.cpp
@@ -46,23 +46,23 @@
 } // namespace
 
 bssl::UniquePtr<X509> deserializeCertificate(const std::vector<uint8_t>& cert,
-                                             CertificateFormat format) {
+                                             RpcCertificateFormat format) {
     switch (format) {
-        case CertificateFormat::PEM:
+        case RpcCertificateFormat::PEM:
             return fromPem(cert);
-        case CertificateFormat::DER:
+        case RpcCertificateFormat::DER:
             return fromDer(cert);
     }
     LOG_ALWAYS_FATAL("Unsupported format %d", static_cast<int>(format));
 }
 
-std::vector<uint8_t> serializeCertificate(X509* x509, CertificateFormat format) {
+std::vector<uint8_t> serializeCertificate(X509* x509, RpcCertificateFormat format) {
     bssl::UniquePtr<BIO> certBio(BIO_new(BIO_s_mem()));
     switch (format) {
-        case CertificateFormat::PEM: {
+        case RpcCertificateFormat::PEM: {
             TEST_AND_RETURN({}, PEM_write_bio_X509(certBio.get(), x509));
         } break;
-        case CertificateFormat::DER: {
+        case RpcCertificateFormat::DER: {
             TEST_AND_RETURN({}, i2d_X509_bio(certBio.get(), x509));
         } break;
         default: {