|
 |
519d7d |
diff --git a/tests/testpkcs11.sh b/tests/testpkcs11.sh
|
|
|
519d7d |
index 7c2776760..cf82c4032 100755
|
|
|
519d7d |
--- a/tests/testpkcs11.sh
|
|
|
519d7d |
+++ b/tests/testpkcs11.sh
|
|
|
519d7d |
@@ -26,11 +26,6 @@ SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
|
|
|
519d7d |
CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
|
|
|
519d7d |
RETCODE=0
|
|
|
519d7d |
|
|
|
519d7d |
-if test "${GNUTLS_FORCE_FIPS_MODE}" = 1;then
|
|
|
519d7d |
- echo "Cannot run in FIPS140-2 mode"
|
|
|
519d7d |
- exit 77
|
|
|
519d7d |
-fi
|
|
|
519d7d |
-
|
|
|
519d7d |
if ! test -x "${P11TOOL}"; then
|
|
|
519d7d |
exit 77
|
|
|
519d7d |
fi
|
|
|
519d7d |
@@ -600,7 +595,8 @@ write_certificate_id_test_rsa () {
|
|
|
519d7d |
cacert="$4"
|
|
|
519d7d |
|
|
|
519d7d |
echo -n "* Generating RSA private key on HSM... "
|
|
|
519d7d |
- ${P11TOOL} ${ADDITIONAL_PARAM} --login --label xxx1-rsa --generate-rsa --bits 1024 "${token}" >>"${TMPFILE}" 2>&1
|
|
|
519d7d |
+ ${P11TOOL} ${ADDITIONAL_PARAM} --login --label xxx1-rsa --generate-rsa \
|
|
|
519d7d |
+ --bits 2048 "${token}" >>"${TMPFILE}" 2>&1
|
|
|
519d7d |
if test $? = 0; then
|
|
|
519d7d |
echo ok
|
|
|
519d7d |
else
|
|
|
519d7d |
@@ -649,7 +645,8 @@ write_certificate_id_test_rsa2 () {
|
|
|
519d7d |
tmpkey="key.$$.tmp"
|
|
|
519d7d |
|
|
|
519d7d |
echo -n "* Generating RSA private key... "
|
|
|
519d7d |
- ${CERTTOOL} ${ADDITIONAL_PARAM} --generate-privkey --bits 1024 --outfile ${tmpkey} >>"${TMPFILE}" 2>&1
|
|
|
519d7d |
+ ${CERTTOOL} ${ADDITIONAL_PARAM} --generate-privkey --bits 2048 \
|
|
|
519d7d |
+ --outfile ${tmpkey} >>"${TMPFILE}" 2>&1
|
|
|
519d7d |
if test $? = 0; then
|
|
|
519d7d |
echo ok
|
|
|
519d7d |
else
|
|
|
519d7d |
@@ -907,7 +904,7 @@ delete_temp_privkey "${TOKEN}" "${GNUTLS_PIN}" ecc-256
|
|
|
519d7d |
import_temp_dsa_privkey "${TOKEN}" "${GNUTLS_PIN}" 2048
|
|
|
519d7d |
delete_temp_privkey "${TOKEN}" "${GNUTLS_PIN}" dsa-2048
|
|
|
519d7d |
|
|
|
519d7d |
-generate_rsa_privkey "${TOKEN}" "${GNUTLS_PIN}" 1024
|
|
|
519d7d |
+generate_rsa_privkey "${TOKEN}" "${GNUTLS_PIN}" 2048
|
|
|
519d7d |
change_id_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
|
|
519d7d |
export_pubkey_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
|
|
519d7d |
change_label_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
|
|
519d7d |
--
|
|
|
519d7d |
2.14.3
|
|
|
519d7d |
|