Merge pull request #102 from bellgrim/SOFTHSM-108

SOFTHSM-108: A marked as trusted certificate cannot be imported.
opendnssec · Jan 25, 2015 · bea4756 · bea4756
2 parents 34d647e + 79b2560
commit bea4756
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,11 @@
 NEWS for SoftHSM -- History of user visible changes
 
+SoftHSM develop
+
+Bugfixes:
+* SOFTHSM-108: A marked as trusted certificate cannot be imported.
+
+
 SoftHSM 2.0.0b2 - 2014-12-28
 
 * SOFTHSM-50: OpenSSL FIPS support.

diff --git a/src/lib/P11Attributes.cpp b/src/lib/P11Attributes.cpp
@@ -401,7 +401,7 @@ CK_RV P11Attribute::update(Token* token, bool isPrivate, CK_VOID_PTR pValue, CK_
 	}
 
 	// Attributes cannot be modified if CKA_TRUSTED is true on a certificate object.
-	if (isTrusted()) {
+	if (isTrusted() && op != OBJECT_OP_GENERATE && op != OBJECT_OP_CREATE) {
 		if (osobject->getUnsignedLongValue(CKA_CLASS, CKO_VENDOR_DEFINED) == CKO_CERTIFICATE)
 		{
 			ERROR_MSG("A trusted certificate cannot be modified");