You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
2.0 KiB
30 lines
2.0 KiB
5 years ago
|
diff --git a/tests/testpkcs11.sh b/tests/testpkcs11.sh
|
||
|
|
index 039d6cc1c..7c2776760 100755
|
||
|
|
--- a/tests/testpkcs11.sh
|
||
|
|
+++ b/tests/testpkcs11.sh
|
||
|
|
@@ -912,8 +912,7 @@ change_id_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
||
|
|
export_pubkey_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
||
|
|
change_label_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
||
|
|
|
||
|
|
-# Disabled: certificates are marked as private in gnutls_3_3_x
|
||
|
|
-#write_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt" tmp-client.pub
|
||
|
|
+write_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt" tmp-client.pub
|
||
|
|
write_serv_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.key"
|
||
|
|
write_serv_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.crt"
|
||
|
|
|
||
|
|
@@ -923,9 +922,8 @@ write_serv_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.cr
|
||
|
|
# Disabled: --test-sign is not supported in gnutls_3_3_x
|
||
|
|
#test_sign "${TOKEN}" "${GNUTLS_PIN}"
|
||
|
|
|
||
|
|
-# Disabled: Cannot test without written certificates (write_certificate_test)
|
||
|
|
-#use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert;object-type=cert" "${TOKEN};object=serv-key;object-type=private" "${srcdir}/testpkcs11-certs/ca.crt" "full URLs"
|
||
|
|
-#use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert" "${TOKEN};object=serv-key" "${srcdir}/testpkcs11-certs/ca.crt" "abbrv URLs"
|
||
|
|
+use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert;object-type=cert" "${TOKEN};object=serv-key;object-type=private" "${srcdir}/testpkcs11-certs/ca.crt" "full URLs"
|
||
|
|
+use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert" "${TOKEN};object=serv-key" "${srcdir}/testpkcs11-certs/ca.crt" "abbrv URLs"
|
||
|
|
|
||
|
|
# Disabled: certificates do not inherit its ID from privkey in gnutls_3_3_x
|
||
|
|
#write_certificate_id_test_rsa "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt"
|
||
|
|
--
|
||
|
|
2.14.3
|
||
|
|
|