commit ee62ff140b476503be4b6c22991942cf16ad9925
author Shawn Willden <swillden@google.com> Tue Nov 03 14:29:22 2015 -0700
committer Shawn Willden <swillden@google.com> Tue Nov 03 14:32:14 2015 -0700
tree 76477fe7ae454483c195d0430094e2630fb16257
parent 6d7f0487f9aa71bbc96d8bdf5cb209858715eae4

Fix build failure caused by merge from DR.

This branch apparently has the new boringssl version from AOSP, but gets
merges from DR, but not AOSP.  This change updates the code to match
AOSP, and to be compatible with the boringssl version, correcting the
error introduced by merging
https://googleplex-android-review.git.corp.google.com/#/c/804970/

Change-Id: If3a2b089e32be72d670fbaaff1241c8e8cafa261

keymaster0_engine.cpp

diff --git a/keymaster0_engine.cpp b/keymaster0_engine.cpp
index 70987f9..70c0d89 100644
--- a/keymaster0_engine.cpp
+++ b/keymaster0_engine.cpp
@@ -301,9 +301,6 @@
     return input_as_bn && BN_ucmp(input_as_bn.get(), rsa->n) >= 0;
 }
 
-#define USER_F_private_transform 100
-#define USER_F_ecdsa_sign 101
-
 int Keymaster0Engine::RsaPrivateTransform(RSA* rsa, uint8_t* out, const uint8_t* in,
                                           size_t len) const {
     const keymaster_key_blob_t* key_blob = RsaKeyToBlob(rsa);
@@ -318,10 +315,10 @@
     if (!Keymaster0Sign(&sign_params, *key_blob, in, len, &signature, &signature_length)) {
         if (data_too_large_for_public_modulus(in, len, rsa)) {
             ALOGE("Keymaster0 signing failed because data is too large.");
-            OPENSSL_PUT_ERROR(RSA, private_transform, RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
+            OPENSSL_PUT_ERROR(RSA, RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
         } else {
             // We don't know what error code is correct; force an "unknown error" return
-            OPENSSL_PUT_ERROR(USER, private_transform, KM_ERROR_UNKNOWN_ERROR);
+            OPENSSL_PUT_ERROR(USER, KM_ERROR_UNKNOWN_ERROR);
         }
         return 0;
     }
@@ -367,7 +364,7 @@
     if (!Keymaster0Sign(&sign_params, *key_blob, digest, digest_len, &signature,
                         &signature_length)) {
         // We don't know what error code is correct; force an "unknown error" return
-        OPENSSL_PUT_ERROR(USER, ecdsa_sign, KM_ERROR_UNKNOWN_ERROR);
+        OPENSSL_PUT_ERROR(USER, KM_ERROR_UNKNOWN_ERROR);
         return 0;
     }
     Eraser eraser(signature.get(), signature_length);