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

Commit 3157161f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 9ca59c38 am: 7ed64c91 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1625482

Change-Id: I5897755e3a2867075d84939f4878d2802bf74757
parents 9425c347 7ed64c91

gatekeeperd/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ cc_binary { 
        "libbase",

        "libutils",

        "libcrypto",

        "libkeystore_aidl",

        "libkeystore_binder",

        "libhidlbase",

        "android.hardware.gatekeeper@1.0",

        "libgatekeeper_aidl",

gatekeeperd/gatekeeperd.cpp

+1 −18
Original line number Diff line number Diff line
@@ -29,13 +29,11 @@ 
#include <android-base/properties.h>

#include <android/binder_ibinder.h>

#include <android/binder_manager.h>

#include <android/security/keystore/IKeystoreService.h>

#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <binder/PermissionCache.h>

#include <gatekeeper/password_handle.h>  // for password_handle_t

#include <hardware/hw_auth_token.h>

#include <keystore/keystore_return_types.h>

#include <libgsi/libgsi.h>

#include <log/log.h>

#include <utils/String16.h>
@@ -303,7 +301,7 @@ class GateKeeperProxy : public BnGateKeeperService { 
            if (gkResponse->payload().size() != 0) {

                // try to connect to IKeystoreAuthorization AIDL service first.

                AIBinder* authzAIBinder =

                        AServiceManager_checkService("android.security.authorization");

                        AServiceManager_getService("android.security.authorization");

                ::ndk::SpAIBinder authzBinder(authzAIBinder);

                auto authzService = IKeystoreAuthorization::fromBinder(authzBinder);

                if (authzService) {
@@ -328,21 +326,6 @@ class GateKeeperProxy : public BnGateKeeperService { 
                        LOG(ERROR) << "Failure in sending AuthToken to AuthorizationService.";

                        return GK_ERROR;

                    }

                }

                sp<IServiceManager> sm = defaultServiceManager();



                sp<IBinder> binder = sm->getService(String16("android.security.keystore"));

                sp<security::keystore::IKeystoreService> service =

                        interface_cast<security::keystore::IKeystoreService>(binder);



                if (service) {

                    int result = 0;

                    auto binder_result = service->addAuthToken(gkResponse->payload(), &result);

                    if (!binder_result.isOk() ||

                        !keystore::KeyStoreServiceReturnCode(result).isOk()) {

                        LOG(ERROR) << "Failure sending auth token to KeyStore: " << result;

                        return GK_ERROR;

                    }

                } else {

                    LOG(ERROR) << "Cannot deliver auth token. Unable to communicate with "

                                  "Keystore.";