ec_keygen: changes required for TPM

These changes depend on EC support being merged
[ie, OpenSC#474]

Until then, this code is not upstreamable.

Upstream-Status: Inappropriate [lmp specific]

Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io>

Author: ldts

src/p11_key.c

@@ -361,24 +361,21 @@ int pkcs11_ec_keygen(PKCS11_SLOT_private *slot, const char *curve,
 	if (label)
 		pkcs11_addattr_s(&pubtmpl, CKA_LABEL, label);
 	pkcs11_addattr_bool(&pubtmpl, CKA_TOKEN, TRUE);
+	pkcs11_addattr_bool(&pubtmpl, CKA_VERIFY, TRUE);
 	pkcs11_addattr_bool(&pubtmpl, CKA_DERIVE, TRUE);
+	pkcs11_addattr_bool(&pubtmpl, CKA_ENCRYPT, TRUE);
 	pkcs11_addattr_bool(&pubtmpl, CKA_WRAP, FALSE);
-	pkcs11_addattr_bool(&pubtmpl, CKA_VERIFY, TRUE);
-	pkcs11_addattr_bool(&pubtmpl, CKA_VERIFY_RECOVER, FALSE);
-	pkcs11_addattr_bool(&pubtmpl, CKA_ENCRYPT, FALSE);
 	pkcs11_addattr(&pubtmpl, CKA_ECDSA_PARAMS, ecdsa_params, ecdsa_params_len);
 
 	/* privkey attributes */
 	pkcs11_addattr(&privtmpl, CKA_ID, id, id_len);
 	if (label)
 		pkcs11_addattr_s(&privtmpl, CKA_LABEL, label);
 	pkcs11_addattr_bool(&privtmpl, CKA_TOKEN, TRUE);
-	pkcs11_addattr_bool(&privtmpl, CKA_PRIVATE, TRUE);
-	pkcs11_addattr_bool(&privtmpl, CKA_SENSITIVE, TRUE);
+	pkcs11_addattr_bool(&privtmpl, CKA_SIGN, TRUE);
 	pkcs11_addattr_bool(&privtmpl, CKA_DERIVE, TRUE);
+	pkcs11_addattr_bool(&privtmpl, CKA_DECRYPT, TRUE);
 	pkcs11_addattr_bool(&privtmpl, CKA_UNWRAP, FALSE);
-	pkcs11_addattr_bool(&privtmpl, CKA_SIGN, TRUE);
-	pkcs11_addattr_bool(&privtmpl, CKA_DECRYPT, FALSE);
 
 	/* call the pkcs11 module to create the key pair */
 	rv = CRYPTOKI_call(ctx, C_GenerateKeyPair(