Allow specifying auto-authenticate property on a more fine grained level.

svn path=/trunk/; revision=1657

diff --git a/gp11/gp11-module.c b/gp11/gp11-module.c
index 8ed46d0..92239ab 100644 (file)
--- a/gp11/gp11-module.c
+++ b/gp11/gp11-module.c
@@ -64,7 +64,7 @@ typedef struct _GP11ModulePrivate {
        GStaticMutex mutex;
        gboolean finalized;
        GHashTable *open_sessions;
-       gboolean auto_authenticate;
+       gint auto_authenticate;
 } GP11ModulePrivate;
 
 #define GP11_MODULE_GET_DATA(o) \
@@ -438,7 +438,7 @@ gp11_module_get_property (GObject *obj, guint prop_id, GValue *value,
                g_value_set_pointer (value, gp11_module_get_functions (self));
                break;
        case PROP_AUTO_AUTHENTICATE:
-               g_value_set_boolean (value, gp11_module_get_auto_authenticate (self));
+               g_value_set_int (value, gp11_module_get_auto_authenticate (self));
                break;
        case PROP_POOL_SESSIONS:
                g_value_set_boolean (value, gp11_module_get_pool_sessions (self));
@@ -464,7 +464,7 @@ gp11_module_set_property (GObject *obj, guint prop_id, const GValue *value,
                data->funcs = g_value_get_pointer (value);
                break;
        case PROP_AUTO_AUTHENTICATE:
-               gp11_module_set_auto_authenticate (self, g_value_get_boolean (value));
+               gp11_module_set_auto_authenticate (self, g_value_get_int (value));
                break;
        case PROP_POOL_SESSIONS:
                gp11_module_set_pool_sessions (self, g_value_get_boolean (value));
@@ -552,8 +552,8 @@ gp11_module_class_init (GP11ModuleClass *klass)
                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
        g_object_class_install_property (gobject_class, PROP_AUTO_AUTHENTICATE,
-               g_param_spec_boolean ("auto-authenticate", "Auto Authenticate", "Auto Login to Token when necessary",
-                                     FALSE, G_PARAM_READWRITE));
+               g_param_spec_int ("auto-authenticate", "Auto Authenticate", "Auto Login to Token when necessary",
+                                 0, G_MAXINT, 0, G_PARAM_READWRITE));
 
        g_object_class_install_property (gobject_class, PROP_POOL_SESSIONS,
                g_param_spec_boolean ("pool-sessions", "Pool Sessions", "Pool sessions?",
@@ -919,11 +919,11 @@ gp11_module_set_pool_sessions (GP11Module *self, gboolean pool)
  *
  * Return value: Whether auto login or not.
  **/
-gboolean
+gint
 gp11_module_get_auto_authenticate (GP11Module *self)
 {
        GP11ModulePrivate *pv = lock_private (self);
-       gboolean ret;
+       gint ret;
 
        g_return_val_if_fail (pv, FALSE);
 
@@ -947,10 +947,14 @@ gp11_module_get_auto_authenticate (GP11Module *self)
  * signal when an object requires authintication.
  **/
 void
-gp11_module_set_auto_authenticate (GP11Module *self, gboolean auto_login)
+gp11_module_set_auto_authenticate (GP11Module *self, gint auto_login)
 {
        GP11ModulePrivate *pv = lock_private (self);
 
+       /* HACK: Get needed fix around API freeze. */
+       if (auto_login == 1)
+               auto_login = GP11_AUTHENTICATE_TOKENS | GP11_AUTHENTICATE_OBJECTS;
+
        g_return_if_fail (pv);
 
        {

diff --git a/gp11/gp11-session.c b/gp11/gp11-session.c
index 737ead3..9bab661 100644 (file)
--- a/gp11/gp11-session.c
+++ b/gp11/gp11-session.c
@@ -1136,7 +1136,7 @@ authenticate_init (Authenticate *auth, GP11Slot *slot, GP11Object *object)
        g_assert (GP11_IS_OBJECT (object));
 
        module = gp11_slot_get_module (slot);
-       if (gp11_module_get_auto_authenticate (module)) {
+       if (gp11_module_get_auto_authenticate (module) & GP11_AUTHENTICATE_OBJECTS) {
                auth->state = AUTHENTICATE_CAN;
                auth->protected_auth = gp11_slot_has_flags (slot, CKF_PROTECTED_AUTHENTICATION_PATH);
                auth->module = module;

diff --git a/gp11/gp11-slot.c b/gp11/gp11-slot.c
index 0da2697..7882aba 100644 (file)
--- a/gp11/gp11-slot.c
+++ b/gp11/gp11-slot.c
@@ -822,7 +822,7 @@ gp11_slot_open_session_full (GP11Slot *self, gulong flags, GCancellable *cancell
                args.slot = self;
                args.flags = flags;
                args.password = NULL;
-               args.auto_login = gp11_module_get_auto_authenticate (module);
+               args.auto_login = (gp11_module_get_auto_authenticate (module) & GP11_AUTHENTICATE_TOKENS) ? TRUE : FALSE;
                args.session = 0;
 
                if (_gp11_call_sync (self, perform_open_session, complete_open_session, &args, cancellable, err))
@@ -871,7 +871,7 @@ gp11_slot_open_session_async (GP11Slot *self, gulong flags, GCancellable *cancel
        module = gp11_slot_get_module (self);
        slot_id = gp11_slot_get_handle (self);
        args->session = _gp11_module_pooled_session_handle (module, slot_id, flags);
-       args->auto_login = gp11_module_get_auto_authenticate (module);
+       args->auto_login = (gp11_module_get_auto_authenticate (module) & GP11_AUTHENTICATE_TOKENS) ? TRUE : FALSE;
        g_object_unref (module);
 
        call = _gp11_call_async_ready (args, cancellable, callback, user_data);

diff --git a/gp11/gp11.h b/gp11/gp11.h
index 8427aec..9fa69ed 100644 (file)
--- a/gp11/gp11.h
+++ b/gp11/gp11.h
@@ -75,6 +75,11 @@ typedef struct GP11Attribute {
 
 #define GP11_INVALID G_MAXULONG
 
+enum {
+       GP11_AUTHENTICATE_TOKENS = 2,
+       GP11_AUTHENTICATE_OBJECTS = 4
+};
+
 /* Used on varargs functions that should end with GP11_INVALID */
 #ifdef NOT_YET_SUPPORTED
 #define GP11_INVALID_TERMINATED __attribute__((__sentinel__(G_MAXULONG)))
@@ -306,10 +311,10 @@ gboolean              gp11_module_get_pool_sessions           (GP11Module *self)
 void                  gp11_module_set_pool_sessions           (GP11Module *self,
                                                                gboolean pool_sessions);
 
-gboolean              gp11_module_get_auto_authenticate       (GP11Module *self);
+gint                  gp11_module_get_auto_authenticate       (GP11Module *self);
 
 void                  gp11_module_set_auto_authenticate       (GP11Module *self,
-                                                               gboolean auto_authenticate);
+                                                               gint auto_authenticate);
 
 gboolean              gp11_module_enumerate_objects           (GP11Module *self,
                                                                GP11ObjectForeachFunc func,