Merge pull request #238 from subrahmanyaman/rsa_import_wychproof_fix

Correction in the calcuclation of RSA KeySize in importKey

Author: mdwivedi

Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java

@@ -3551,7 +3551,7 @@ private void importRSAKey(byte[] scratchPad) {
     // check the keysize tag if present in key parameters.
     short keysize =
         KMIntegerTag.getShortValue(KMType.UINT_TAG, KMType.KEYSIZE, data[KEY_PARAMETERS]);
-    short kSize = (short) (KMByteBlob.length(data[SECRET]) * 8);
+    short kSize = (short) (KMByteBlob.length(data[PUB_KEY]) * 8);
     if (keysize != KMType.INVALID_VALUE) {
       if (keysize != 2048 || (keysize != kSize)) {
         KMException.throwIt(KMError.IMPORT_PARAMETER_MISMATCH);