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

Commit 6358b881 authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Handle KM_ERROR_CALLER_NONCE_PROHIBITED. 

This converts KM_ERROR_CALLER_NONCE_PROHIBITED into
InvalidAlgorithmParameterSpec, as expected by the contract of JCA
Cipher.

Bug: 18088752
Change-Id: I6a01e2d7118c478b27a0d7a5a14a127de8913755
parent 033dc46b

core/java/android/security/keymaster/KeymasterDefs.java

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ public final class KeymasterDefs { 
        sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_EC_FIELD, "Unsupported EC field");

        sErrorCodeToString.put(KM_ERROR_MISSING_NONCE, "Required IV missing");

        sErrorCodeToString.put(KM_ERROR_INVALID_NONCE, "Invalid IV");

        sErrorCodeToString.put(KM_ERROR_CALLER_NONCE_PROHIBITED,

                "Caller-provided IV not permitted");

        sErrorCodeToString.put(KM_ERROR_UNIMPLEMENTED, "Not implemented");

        sErrorCodeToString.put(KM_ERROR_UNKNOWN_ERROR, "Unknown error");

    }

keystore/java/android/security/KeyStoreCryptoOperationUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ abstract class KeyStoreCryptoOperationUtils { 
        switch (beginOpResultCode) {

            case KeymasterDefs.KM_ERROR_INVALID_NONCE:

                return new InvalidAlgorithmParameterException("Invalid IV");

            case KeymasterDefs.KM_ERROR_CALLER_NONCE_PROHIBITED:

                return new InvalidAlgorithmParameterException("Caller-provided IV not permitted");

        }



        // General cases