Merge pull request #677 from dcoombs/develop

Fix memory leak in SoftHSM::UnwrapKeySym.

Author: halderen

src/lib/SoftHSM.cpp

@@ -6831,9 +6831,10 @@ CK_RV SoftHSM::UnwrapKeySym
 		rv = CKR_OK;
 		if (!cipher->unwrapKey(unwrappingkey, mode, wrapped, keydata))
 			rv = CKR_GENERAL_ERROR;
-		cipher->recycleKey(unwrappingkey);
-		CryptoFactory::i()->recycleSymmetricAlgorithm(cipher);
 	}
+
+	cipher->recycleKey(unwrappingkey);
+	CryptoFactory::i()->recycleSymmetricAlgorithm(cipher);
 	return rv;
 }