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

Commit 6587776a authored by Andrew Scull's avatar Andrew Scull
Browse files

Tweak remote_provisioning command line interface 

Only print an IRPC's minimum number of keys on versions of the HAL where
it will be meaningful and initialized. Also indicate which options could
not be understood.

Test: atest RemoteProvisioningShellCommandTest
Bug: 265747549
Change-Id: I0dbcd6af5a5de20783b6d57874fb67801a39240d
parent 249b56d8

services/core/java/com/android/server/security/rkp/RemoteProvisioningShellCommand.java

+4 −2
Original line number Diff line number Diff line
@@ -134,8 +134,10 @@ class RemoteProvisioningShellCommand extends ShellCommand { 
            pw.println("supportedEekCurve=" + info.supportedEekCurve);

        }

        pw.println("uniqueId=" + info.uniqueId);

        if (info.versionNumber >= 3) {

            pw.println("supportedNumKeysInCsr=" + info.supportedNumKeysInCsr);

        }

    }



    private int list() throws RemoteException {

        for (String name : mInjector.getIrpcNames()) {
@@ -153,7 +155,7 @@ class RemoteProvisioningShellCommand extends ShellCommand { 
                    challenge = Base64.getDecoder().decode(getNextArgRequired());

                    break;

                default:

                    getErrPrintWriter().println("error: unknown option");

                    getErrPrintWriter().println("error: unknown option " + opt);

                    return ERROR;

            }

        }