gnutls_pkcs11_copy_x509_privkey2: corrected the type of the written object

Previously only RSA objects were correctly written.

diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c
index d8b756f68e20b277437ed159283a1a4bc43bd8df..413a9504cad1ff9758abac0e8f795a51ee19cd06 100644 (file)
--- a/lib/pkcs11_write.c
+++ b/lib/pkcs11_write.c
@@ -722,11 +722,6 @@ gnutls_pkcs11_copy_x509_privkey2(const char *token_url,
                a_val++;
        }
 
-       a[a_val].type = CKA_KEY_TYPE;
-       a[a_val].value = &type;
-       a[a_val].value_len = sizeof(type);
-       a_val++;
-
        a[a_val].type = CKA_TOKEN;
        a[a_val].value = (void *) &tval;
        a[a_val].value_len = sizeof(tval);
@@ -916,6 +911,11 @@ gnutls_pkcs11_copy_x509_privkey2(const char *token_url,
                goto cleanup;
        }
 
+       a[a_val].type = CKA_KEY_TYPE;
+       a[a_val].value = &type;
+       a[a_val].value_len = sizeof(type);
+       a_val++;
+
        rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &obj);
        if (rv != CKR_OK) {
                gnutls_assert();