Merge pull request parallaxsecond#254 from ionut-arm/pkcs11-export-fix

ionut-arm · web-flow · commit b80416b23695 · 2020-09-21T14:57:52.000+01:00
Fix attribute conversion in PKCS11 provider
diff --git a/src/providers/pkcs11_provider/utils.rs b/src/providers/pkcs11_provider/utils.rs
@@ -620,11 +620,11 @@ fn key_pair_usage_flags_to_pkcs11_attributes(
     }
 
     if usage_flags.export {
-        priv_template.push(CK_ATTRIBUTE::new(CKA_EXTRACTABLE).with_bool(&CK_FALSE));
-        priv_template.push(CK_ATTRIBUTE::new(CKA_SENSITIVE).with_bool(&CK_TRUE));
-    } else {
         priv_template.push(CK_ATTRIBUTE::new(CKA_EXTRACTABLE).with_bool(&CK_TRUE));
         priv_template.push(CK_ATTRIBUTE::new(CKA_SENSITIVE).with_bool(&CK_FALSE));
+    } else {
+        priv_template.push(CK_ATTRIBUTE::new(CKA_EXTRACTABLE).with_bool(&CK_FALSE));
+        priv_template.push(CK_ATTRIBUTE::new(CKA_SENSITIVE).with_bool(&CK_TRUE));
     }
 
     if usage_flags.copy {

Original file line number	Diff line number	Diff line change
`@@ -620,11 +620,11 @@ fn key_pair_usage_flags_to_pkcs11_attributes(`
`620`	`620`	`}`
`621`	`621`
`622`	`622`	`if usage_flags.export {`
`623`		`- priv_template.push(CK_ATTRIBUTE::new(CKA_EXTRACTABLE).with_bool(&CK_FALSE));`
`624`		`- priv_template.push(CK_ATTRIBUTE::new(CKA_SENSITIVE).with_bool(&CK_TRUE));`
`625`		`- } else {`
`626`	`623`	`priv_template.push(CK_ATTRIBUTE::new(CKA_EXTRACTABLE).with_bool(&CK_TRUE));`
`627`	`624`	`priv_template.push(CK_ATTRIBUTE::new(CKA_SENSITIVE).with_bool(&CK_FALSE));`
	`625`	`+ } else {`
	`626`	`+ priv_template.push(CK_ATTRIBUTE::new(CKA_EXTRACTABLE).with_bool(&CK_FALSE));`
	`627`	`+ priv_template.push(CK_ATTRIBUTE::new(CKA_SENSITIVE).with_bool(&CK_TRUE));`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`if usage_flags.copy {`