diff options
| author | Anderson Toshiyuki Sasaki <ansasaki@redhat.com> | 2018-07-20 11:51:42 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-09-14 16:54:16 +0200 |
| commit | 4a4b65c75717bb06ff95439f7f5a69a84a67f543 (patch) | |
| tree | 3ea7d2f180f608488b49087ed8132a6e72b2fc21 | |
| parent | a9578d2dcf42f8612d08e1bfdfa38d790098fe7c (diff) | |
| download | gnutls-4a4b65c75717bb06ff95439f7f5a69a84a67f543.tar.gz | |
tests: increase generated RSA keys size in testpkcs11.sh
The size of the generated RSA keys were increased from 1024 to 2048
bits, allowing testpkcs11.sh to run in FIPS140-2 mode.
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
| -rwxr-xr-x | tests/testpkcs11.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/testpkcs11.sh b/tests/testpkcs11.sh index 7c2776760e..cf82c4032e 100755 --- a/tests/testpkcs11.sh +++ b/tests/testpkcs11.sh @@ -26,11 +26,6 @@ SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" RETCODE=0 -if test "${GNUTLS_FORCE_FIPS_MODE}" = 1;then - echo "Cannot run in FIPS140-2 mode" - exit 77 -fi - if ! test -x "${P11TOOL}"; then exit 77 fi @@ -600,7 +595,8 @@ write_certificate_id_test_rsa () { cacert="$4" echo -n "* Generating RSA private key on HSM... " - ${P11TOOL} ${ADDITIONAL_PARAM} --login --label xxx1-rsa --generate-rsa --bits 1024 "${token}" >>"${TMPFILE}" 2>&1 + ${P11TOOL} ${ADDITIONAL_PARAM} --login --label xxx1-rsa --generate-rsa \ + --bits 2048 "${token}" >>"${TMPFILE}" 2>&1 if test $? = 0; then echo ok else @@ -649,7 +645,8 @@ write_certificate_id_test_rsa2 () { tmpkey="key.$$.tmp" echo -n "* Generating RSA private key... " - ${CERTTOOL} ${ADDITIONAL_PARAM} --generate-privkey --bits 1024 --outfile ${tmpkey} >>"${TMPFILE}" 2>&1 + ${CERTTOOL} ${ADDITIONAL_PARAM} --generate-privkey --bits 2048 \ + --outfile ${tmpkey} >>"${TMPFILE}" 2>&1 if test $? = 0; then echo ok else @@ -907,7 +904,7 @@ delete_temp_privkey "${TOKEN}" "${GNUTLS_PIN}" ecc-256 import_temp_dsa_privkey "${TOKEN}" "${GNUTLS_PIN}" 2048 delete_temp_privkey "${TOKEN}" "${GNUTLS_PIN}" dsa-2048 -generate_rsa_privkey "${TOKEN}" "${GNUTLS_PIN}" 1024 +generate_rsa_privkey "${TOKEN}" "${GNUTLS_PIN}" 2048 change_id_of_privkey "${TOKEN}" "${GNUTLS_PIN}" export_pubkey_of_privkey "${TOKEN}" "${GNUTLS_PIN}" change_label_of_privkey "${TOKEN}" "${GNUTLS_PIN}" |