|
 |
b88a44 |
diff --git a/tests/testpkcs11.sh b/tests/testpkcs11.sh
|
|
|
b88a44 |
index 039d6cc1c..7c2776760 100755
|
|
|
b88a44 |
--- a/tests/testpkcs11.sh
|
|
|
b88a44 |
+++ b/tests/testpkcs11.sh
|
|
|
b88a44 |
@@ -912,8 +912,7 @@ change_id_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
|
|
b88a44 |
export_pubkey_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
|
|
b88a44 |
change_label_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
|
|
|
b88a44 |
|
|
|
b88a44 |
-# Disabled: certificates are marked as private in gnutls_3_3_x
|
|
|
b88a44 |
-#write_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt" tmp-client.pub
|
|
|
b88a44 |
+write_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt" tmp-client.pub
|
|
|
b88a44 |
write_serv_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.key"
|
|
|
b88a44 |
write_serv_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.crt"
|
|
|
b88a44 |
|
|
|
b88a44 |
@@ -923,9 +922,8 @@ write_serv_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.cr
|
|
|
b88a44 |
# Disabled: --test-sign is not supported in gnutls_3_3_x
|
|
|
b88a44 |
#test_sign "${TOKEN}" "${GNUTLS_PIN}"
|
|
|
b88a44 |
|
|
|
b88a44 |
-# Disabled: Cannot test without written certificates (write_certificate_test)
|
|
|
b88a44 |
-#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"
|
|
|
b88a44 |
-#use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert" "${TOKEN};object=serv-key" "${srcdir}/testpkcs11-certs/ca.crt" "abbrv URLs"
|
|
|
b88a44 |
+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"
|
|
|
b88a44 |
+use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert" "${TOKEN};object=serv-key" "${srcdir}/testpkcs11-certs/ca.crt" "abbrv URLs"
|
|
|
b88a44 |
|
|
|
b88a44 |
# Disabled: certificates do not inherit its ID from privkey in gnutls_3_3_x
|
|
|
b88a44 |
#write_certificate_id_test_rsa "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt"
|
|
|
b88a44 |
--
|
|
|
b88a44 |
2.14.3
|
|
|
b88a44 |
|