diff options
author | Nicolas Boichat <drinkcat@google.com> | 2017-02-07 11:40:59 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-02-18 00:39:28 -0800 |
commit | 83bd850f3fd45648bb811f6080efac396c8a2062 (patch) | |
tree | 3e22a3c7755002b5dbe55eb0ce951afc4ab24899 /tests | |
parent | 94bd5c5069e6ca0c99754f39152bd4e059968904 (diff) | |
download | vboot-83bd850f3fd45648bb811f6080efac396c8a2062.tar.gz |
vboot_reference: Add support for 2048-bit exponent 3 keysstabilize-9313.Bfirmware-cr50-release-9308.25.Bfirmware-cr50-mp-release-9308.87.Bfirmware-cr50-mp-r86-9311.70.Bfirmware-cr50-mp-9311.Bfirmware-cr50-guc-factory-9308.26.Bfirmware-cr50-9308.Bfirmware-cr50-9308.24.B
This also adds the required tests (keys, testcases).
BRANCH=none
BUG=chromium:684354
TEST=make runtests
Change-Id: I5e148f8792ea325f813d76089271f3c4bcc2935d
Reviewed-on: https://chromium-review.googlesource.com/438951
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/common.sh | 2 | ||||
-rwxr-xr-x | tests/futility/test_show_rwsig.sh | 2 | ||||
-rwxr-xr-x | tests/gen_test_keys.sh | 10 | ||||
-rw-r--r-- | tests/testcases/test_file.rsa2048_exp3_sha1.sig | bin | 0 -> 256 bytes | |||
-rw-r--r-- | tests/testcases/test_file.rsa2048_exp3_sha256.sig | 2 | ||||
-rw-r--r-- | tests/testcases/test_file.rsa2048_exp3_sha512.sig | bin | 0 -> 256 bytes | |||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.crt | 20 | ||||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.keyb | bin | 0 -> 520 bytes | |||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.pem | 27 | ||||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.sha1.vbprivk | bin | 0 -> 1200 bytes | |||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.sha1.vbpubk | bin | 0 -> 552 bytes | |||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.sha256.vbprivk | bin | 0 -> 1200 bytes | |||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.sha256.vbpubk | bin | 0 -> 552 bytes | |||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.sha512.vbprivk | bin | 0 -> 1200 bytes | |||
-rw-r--r-- | tests/testkeys/key_rsa2048_exp3.sha512.vbpubk | bin | 0 -> 552 bytes |
15 files changed, 60 insertions, 3 deletions
diff --git a/tests/common.sh b/tests/common.sh index 2b017cc5..78a47fa8 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -28,7 +28,7 @@ COL_BLUE='\E[34;1m' COL_STOP='\E[0;m' hash_algos=( sha1 sha256 sha512 ) -key_lengths=( 1024 2048 4096 8192 ) +key_lengths=( 1024 2048 4096 8192 2048_exp3 ) function happy { echo -e "${COL_GREEN}$*${COL_STOP}" 1>&2 diff --git a/tests/futility/test_show_rwsig.sh b/tests/futility/test_show_rwsig.sh index 7ff25571..915842d6 100755 --- a/tests/futility/test_show_rwsig.sh +++ b/tests/futility/test_show_rwsig.sh @@ -13,7 +13,7 @@ DATADIR="${SCRIPTDIR}/data" TESTKEYS=${SRCDIR}/tests/testkeys # Do not test 8192 as the signature length is > 1024 bytes -SIGS="1024 2048 4096" +SIGS="1024 2048 4096 2048_exp3" HASHES="SHA1 SHA256 SHA512" set -o pipefail diff --git a/tests/gen_test_keys.sh b/tests/gen_test_keys.sh index dbb17419..04315ac3 100755 --- a/tests/gen_test_keys.sh +++ b/tests/gen_test_keys.sh @@ -25,7 +25,15 @@ function generate_keys { continue fi - openssl genrsa -F4 -out ${key_base}.pem $i + # Extract exponent from key_length name, if necessary + exp="F4" + bits=$i + if [ "${i##*_exp}" != "${i}" ]; then + exp="${i##*_exp}" + bits="${i%%_exp${exp}}" + fi + + openssl genrsa -${exp} -out ${key_base}.pem ${bits} # Generate self-signed certificate from key. openssl req -batch -new -x509 -key ${key_base}.pem \ -out ${key_base}.crt diff --git a/tests/testcases/test_file.rsa2048_exp3_sha1.sig b/tests/testcases/test_file.rsa2048_exp3_sha1.sig Binary files differnew file mode 100644 index 00000000..75cd3ba4 --- /dev/null +++ b/tests/testcases/test_file.rsa2048_exp3_sha1.sig diff --git a/tests/testcases/test_file.rsa2048_exp3_sha256.sig b/tests/testcases/test_file.rsa2048_exp3_sha256.sig new file mode 100644 index 00000000..1192c8e3 --- /dev/null +++ b/tests/testcases/test_file.rsa2048_exp3_sha256.sig @@ -0,0 +1,2 @@ + _#ٌ%:aollnLNAUʩu4yѷ_02mԩ*a.Ъa-f@9+"+|+YxH4~ƛVW<vO5:@8bp'XzLLQ4 +J~6 iQC9]Sa qOnl_x-inuyzKi2|xԂIVg=ݬ~Gΰ^ u7TȘ =Kk,%*
\ No newline at end of file diff --git a/tests/testcases/test_file.rsa2048_exp3_sha512.sig b/tests/testcases/test_file.rsa2048_exp3_sha512.sig Binary files differnew file mode 100644 index 00000000..155474a1 --- /dev/null +++ b/tests/testcases/test_file.rsa2048_exp3_sha512.sig diff --git a/tests/testkeys/key_rsa2048_exp3.crt b/tests/testkeys/key_rsa2048_exp3.crt new file mode 100644 index 00000000..1c88aea8 --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDWzCCAkOgAwIBAgIJAO+pvxf/+8DVMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQwHhcNMTcwMjA3MDgzNTQ5WhcNMTcwMzA5MDgzNTQ5WjBF +MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 +ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIDANBgkqhkiG9w0BAQEFAAOCAQ0AMIIB +CAKCAQEA3UvKSmYs87zzCjmpwlSJlOdsoz+7JFekYTbUizUwf+k20mz9d042zL3X +PFenwKsNwrqS0+iJ+zwLMXmDG5+Jnh/4k1xCpjz9gAoIuTHYSR+nFfvJBocdZhiX +LAZW1RSbqYaZJn67JR4GgajrmhJkk1nOhY1y4kPqEwuVbWFX5V50ZiDta0iqUyph +ADb3Z0xBRS6SjRJAtyV2KiR6oi15qnKCD9rxIOtWAUMUjmhZeSpxUS4+iPsEh7j4 +oKlMys7Ty2NXxxo12f6orz0vJn3zcaj2XFgQZNZF56W5N5VjXIiDPNYoNArDICXm +BhhtAYRh+tGGsUotNKiC4k4hufEvVQIBA6NQME4wHQYDVR0OBBYEFHfxG/+7G+zh +jH4d8VpC/dnCXTN0MB8GA1UdIwQYMBaAFHfxG/+7G+zhjH4d8VpC/dnCXTN0MAwG +A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAMJe2ClDV+DeQudWz++yTLUz +qgn6XHSgPv/jgyWXxEcguh6G4GXuCgEykkJ2l4Zyb9+0QurOa4/cDv1Vu54p60ZF +OhQyX0YFNTXIXJkuFy2KEClSpQ0yglrFaPzBmpmJY4LMR2Dbxze/f+i94HaeQDFd +Sze8VyJxnqagBNX6QgxWEhUvIs/OVwkkJ2ZoK7JkhX9gDzxUZ01EvFkoszQNxDgy +ETFxBf/pbZspKiyOVoWCm4OzKXIAqRqWX1Gg2BFUdxLof6XbD/F96xcsUgZkTBuu +thBMQrCxGwmbZhwnfoZ0PgcagCdqlLkUUsOJuj4AGDK+4X8Rdzlc5wbjPBAgt9U= +-----END CERTIFICATE----- diff --git a/tests/testkeys/key_rsa2048_exp3.keyb b/tests/testkeys/key_rsa2048_exp3.keyb Binary files differnew file mode 100644 index 00000000..3f8c5645 --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.keyb diff --git a/tests/testkeys/key_rsa2048_exp3.pem b/tests/testkeys/key_rsa2048_exp3.pem new file mode 100644 index 00000000..ca3127c0 --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA3UvKSmYs87zzCjmpwlSJlOdsoz+7JFekYTbUizUwf+k20mz9 +d042zL3XPFenwKsNwrqS0+iJ+zwLMXmDG5+Jnh/4k1xCpjz9gAoIuTHYSR+nFfvJ +BocdZhiXLAZW1RSbqYaZJn67JR4GgajrmhJkk1nOhY1y4kPqEwuVbWFX5V50ZiDt +a0iqUyphADb3Z0xBRS6SjRJAtyV2KiR6oi15qnKCD9rxIOtWAUMUjmhZeSpxUS4+ +iPsEh7j4oKlMys7Ty2NXxxo12f6orz0vJn3zcaj2XFgQZNZF56W5N5VjXIiDPNYo +NArDICXmBhhtAYRh+tGGsUotNKiC4k4hufEvVQIBAwKCAQEAk4fcMZlzTSiiBtEb +1uMGY0TzF3/SGDptliSNsiN1qpt54Z3+T4l53dPk0uUagHIJLHxh4psGp31cy6ZX +Z7+xFBVQYj2BxCipAAawe3aQML/EuVKGBFoTmWW6HVmPOLhnxlm7bv8nbhQEVnCd +EWGYYjvfA7Oh7C1Gt10OSOuP7j26NRur2gNita/MT2FCKxQ6Dnu2lkTc9I5XkP2+ +v7BhLG/zkwvOcGeXtSbmAXXh5ON/igSe0WZvMKj0ql+f8S7vnevoDOFIeHm7diCO +Ej0fWavFMAPOZokBzQycSuQ0awrV8gM4xMpahBjwRcC3UMoNLmlvo8kcbkxJ0Sbv +AcLMMwKBgQD+ZjSJyf6Or48fyOlWG0/do1mpJogoawyOK5mF3Z7O6wVm+DMpXQsE +ApIZzblMajmZQcvZ/AR+/mDV2s34x6WGFkR7GMIHHoaIuA3Qk6jm/qFdgcAmumHU +vtrGDX+votDfBeoIb+bWCRjjD3SeEpoNjy/1DYNQmYkRQ0zIJZ9QUwKBgQDesELh +2kUHkxOOwDu+C14MjBtXhSLM3UNkpQ5WpQYY/MUtuxYSG0Tubvahvn46N5uYwFt2 +UtzewFqzxkvkGWLmSD0AmwZCBsGGxf6Jd3ldbIXxEpI0EKbudTgIub9lGSdjS+dK +nPRlUOeajgK79btApgNqLhkx9a0C5UbzEa2stwKBgQCpmXhb2/8Jyl9qhfDkEjU+ +bOZwxFrFnLMJcmZZPmnfR1jvUCIbk1ytVwwRM9DdnCZmK907/VhUqZXj5zP7L8Ou +uYL8uywEvwRbJV6LDRtEqcDpASrEfEE4fzyECP/KbIs/WUawSpnkBhCXX6MUDGaz +tMqjXleLEQYLgjMwGRTgNwKBgQCUdYHr5tivt2JfKtJ+sj6zCBI6WMHd6NeYbgmP +GK67Uy4efLlhZ4NJn08Wfv7Reme7KuekNz3p1ZHNLt1Cu5dEMCirEgQsBIEEg/8G +T6Y+SFlLYbbNYG9Jo3qwe9TuEMTs3UTcaKLuNe+8Xqx9TnzVxAJGyWYhTnNXQ4Si +C8kdzwKBgQCmfbKHyzXa0E1dFQKU59hXBhSKBp6ZvD/pF5Ed4tZW0ubdCVs7665p +cdi5ljpJsjqHzWTn8TLdbXZ2jYPPNTC89wZ8F1lrPHCYz/Ifnoahlcbp7OIiIcWx +S6YTzuFdpxAAdwstY91LMxzzMZm47hZUw/KzEVfzIpdyLbeCouohzg== +-----END RSA PRIVATE KEY----- diff --git a/tests/testkeys/key_rsa2048_exp3.sha1.vbprivk b/tests/testkeys/key_rsa2048_exp3.sha1.vbprivk Binary files differnew file mode 100644 index 00000000..357a53a7 --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.sha1.vbprivk diff --git a/tests/testkeys/key_rsa2048_exp3.sha1.vbpubk b/tests/testkeys/key_rsa2048_exp3.sha1.vbpubk Binary files differnew file mode 100644 index 00000000..8f17ce92 --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.sha1.vbpubk diff --git a/tests/testkeys/key_rsa2048_exp3.sha256.vbprivk b/tests/testkeys/key_rsa2048_exp3.sha256.vbprivk Binary files differnew file mode 100644 index 00000000..eb10c73c --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.sha256.vbprivk diff --git a/tests/testkeys/key_rsa2048_exp3.sha256.vbpubk b/tests/testkeys/key_rsa2048_exp3.sha256.vbpubk Binary files differnew file mode 100644 index 00000000..70bfcf6e --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.sha256.vbpubk diff --git a/tests/testkeys/key_rsa2048_exp3.sha512.vbprivk b/tests/testkeys/key_rsa2048_exp3.sha512.vbprivk Binary files differnew file mode 100644 index 00000000..0e1f862c --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.sha512.vbprivk diff --git a/tests/testkeys/key_rsa2048_exp3.sha512.vbpubk b/tests/testkeys/key_rsa2048_exp3.sha512.vbpubk Binary files differnew file mode 100644 index 00000000..429d2c3d --- /dev/null +++ b/tests/testkeys/key_rsa2048_exp3.sha512.vbpubk |