commit 53488c665d57bf64ed7cf45b72599cff29c517c3
author Shawn Willden <swillden@google.com> Thu Jul 16 18:15:45 2015 -0600
committer Shawn Willden <swillden@google.com> Mon Jul 20 08:38:15 2015 -0600
tree f1692ea70b9ab3c73547765ee993bec9a69e2ad0
parent 9972a539acb4d17368ee607465d61b48acd71bde

Use minimum 20 bytes salt for RSA PSS.

This is for compatibility with Bouncy Castle.

Bug: 22492259
Change-Id: I753e5fd223404ba960b6a35862bbd20f519f369b

android_keymaster_test.cpp

diff --git a/android_keymaster_test.cpp b/android_keymaster_test.cpp
index 3e9d125..9a76b1b 100644
--- a/android_keymaster_test.cpp
+++ b/android_keymaster_test.cpp
@@ -1373,7 +1373,7 @@
                     key_bits = digest_bits + 8 * (11 + 19);
                     break;
                 case KM_PAD_RSA_PSS:
-                    key_bits = digest_bits + 8 * 10;
+                    key_bits = digest_bits + 22 * 8;
                     break;
                 default:
                     FAIL() << "Missing padding";