Fix test suite deficiencies.

While trying to debug/test some vbutil_kernel changes
(coming in a different CL) it was noticed that this utility
is not covered by tests, and the script which runs it to set
up further testing (tests/gen_fuzz_test_cases.sh) fails
because of the key format mismatch.

Some investigation has shown that this was left behind when
vboot_reference key storage format was changed.

To make gen_fuzz_test_cases.sh work again a new set of test
keys is required, the keys are generated by
tests/gen_test_keys.sh. This utility had to be changed to
generate the proper set of wrapped public and private keys.

Actually code in tests/gen_test_keys.shgenerate_keys() is
copied in pasted in many scripts in this tree, this has to
be refactored, but under a different CL.

Once the changes were made, two scripts were run:
 ./tests/gen_test_keys.sh
 ./gen_test_cases.sh

resulting in the new and updated keys generated.

firmware/stub/tpm_lite_stub.c was edited to fix compilation
warning issued when compiling with debugging enabled.

Change-Id: I26a45cbad00d21a29195f2a89b4df7d3559133fe

BUG=chromium-os:7178
TEST=described below

The following commands succeed:

vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
make
make runtests
./tests/gen_fuzz_test_cases.sh
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

note that  ./tests/gen_fuzz_test_cases.sh was failing
before this change.

The upcoming CL modifying vbutil_kernel will make sure
gen_fuzz_test_cases.sh is executed when tests are run and
will enhance it to cover vbutil_kernel testing.

Review URL: http://codereview.chromium.org/3423022

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/testkeys/key_rsa2048.crt b/tests/testkeys/key_rsa2048.crt
index be07e231..345c5b03 100644
--- a/tests/testkeys/key_rsa2048.crt
+++ b/tests/testkeys/key_rsa2048.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIJAI/L3BTiaw8mMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+MIIDtTCCAp2gAwIBAgIJALUtT8qFaG3MMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTAwMjExMDMwMjUwWhcNMTAwMzEzMDMwMjUwWjBF
+aWRnaXRzIFB0eSBMdGQwHhcNMTAwOTI5MTgxNjM3WhcNMTAxMDI5MTgxNjM3WjBF
 MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApA5UbgUpStEy2Vkbb/3QxqIDDPgGuJn4k4pUS6GnMvx+OGj2tGIR/4n5
-3dN88vi5gDEujjdgauCJXTzbGEPVRks5tk5RYVq4Z6xtd9LrFgrEicAQFGhRVb5Z
-BnCKg3sw7Ynrrb/bdIYwX7TpOQB3PPaPQjvHUDwEv+Glc2nBxGZEn08AmEp9ZKkX
-gT15ZBZGB5O9BrJCHKF50WNX8B1+JhImXoipZxUGUtT3lH7FCXANcglTNYfKEx1D
-3xMdsNlAsbAqmr0pEyrXUzMpX94hN0OCIsbbbP3+XDzTxEqXAfwf8xz/XCgmvCye
-ZvhLHvKx3H7Qde7yXRQmSCEEbDv4nwIDAQABo4GnMIGkMB0GA1UdDgQWBBQbv1E7
-dTqAPTN116AWdKjE04IDwzB1BgNVHSMEbjBsgBQbv1E7dTqAPTN116AWdKjE04ID
-w6FJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
-BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAI/L3BTiaw8mMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFz3W6BnhnyyJjr7STpPdpxEzvFyrW0h
-c+9HvAP3FDcRjqbpjNa33GPVJEXKMdOhEXTMQ86aCwY8KVZpylt8hJZ0NBLO1bgO
-cb8aqkCXqhAyYTf5qJDIJ6d6tVYWp86dBbp1ll7svU+QU7S+cgTyiTyGgr4t5Z0s
-VyY+zlp1TVWXOUSj5ymWmLm2zJTdhNeAAHKZLRkEtIkS3oitjfcclwunADkZqVZf
-3VLkYUoIMm0Pisook01nls/RTnClxn6WAaEOJcxPkA2GE0O4NZCtB8BMd26u1U+L
-buTrn+HIg+XjJO4CUh2hsU7B2iUNWScNvubQXtJIfYyJO52DlwO1eMk=
+CgKCAQEAlF3KFZo9kW2YYaUJTce11BYEq9nTsP8E0+e+Tw5JUJ1M45s8UJSzOgKQ
+eSLR3399TSq0WSqsSa8QFvBACv7LmM7CgkgI4mMj2Zl96XJVyZP2+2c6hgvwRuB3
+eG6J5K2sW5YwiIz+5SQcPolp5F6r17tMZzgidgIxrN32VvUZt5VplILTU4h7J9ZN
+aipoG3JdFloxqOqOda5Lksf8CicshGJqSiqgpvdx2zVNX9cjKNpqzEvZrNKPLKDt
+eFzohPqrM7n2g+nKgAbwWLa9zELCRG8h1qfbLOXOjrgVgy/g8t5ixWOrRBrbY5nQ
+Cv7eeKEetH8ru3ZMNtOgeWzOup0Q1QIDAQABo4GnMIGkMB0GA1UdDgQWBBS4iVvg
+Pwj7rvZGFREEB72zhy5ioDB1BgNVHSMEbjBsgBS4iVvgPwj7rvZGFREEB72zhy5i
+oKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJALUtT8qFaG3MMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEvl4kjYGYjCiUyRjWm6pm18riNHWPd3
+u9RImngeZTj1E0eojD+8ZxI4jUBMHrgFURbcp1jvnZnBBYQfNpq4vM2f88YtEBvA
+oEt09Tj24uGHMIDihY1pnmFnSA9d22Qpca0AwpFj2LRlu4CcdPA/zE/+YBAiTnjW
+Z9pkLggI4w0j35eUgSBUQHdrZKQ7w6iALp37pDBjHVB5tIaRczJhh5DyULWZueEV
+aqtvYyp3uH8BljRXiT2mw5tjITJnb5VsE/fhM6y3V+oIGooTjUGMiUUnn9TAQDli
+FVFopNQfX1TfOaATx9lmnrdr/YzALz2bgjg45Q/IBQ+Q7SvG8YTU03Y=
 -----END CERTIFICATE-----