commit 93588f53d918fe6c7452da076b95081fb6aa9aef

Author: Ingo Franzki <ifranzki@linux.ibm.com>

Date:   Wed Jun 30 13:18:39 2021 +0200

    COMMON: Prevent unsavable operation state to be exported

    Tokens using OpenSSL 3.0 to implement digest operations (SHA, MD5) are no

    longer able to store its digest state in the session context in a way

    that it could be exported via C_GetOperationState(). OpenSSL 3.0 does not

    provide support to get the digest state. A token must therefore place

    pointers to OpenSSL digest contexts into the session state structure.

    Such a state can not be externalized through C_GetOperationState().

    Also see the discussion in OpenSSL issue "Digest State Serialization":

    https://github.com/openssl/openssl/issues/14222

    Allow a token to mark an operation context as 'not saveable', which will

    cause C_GetOperationState() to return CKR_STATE_UNSAVEABLE if it is tried

    to save such a state.

    Also, such operation contexts can not simply be freed that way the common

    code performs that. Allow a token to use a custom context free function,

    to cleanup such complex context structures.

    Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>

diff --git a/usr/lib/common/decr_mgr.c b/usr/lib/common/decr_mgr.c

index 9842302b..fea6c99e 100644

--- a/usr/lib/common/decr_mgr.c

+++ b/usr/lib/common/decr_mgr.c

@@ -620,7 +620,8 @@ done:

 //

 //

-CK_RV decr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx)

+CK_RV decr_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                       ENCR_DECR_CONTEXT *ctx)

 {

     if (!ctx) {

         TRACE_ERROR("Invalid function argument.\n");

@@ -635,6 +636,7 @@ CK_RV decr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx)

     ctx->init_pending = FALSE;

     ctx->context_len = 0;

     ctx->pkey_active = FALSE;

+    ctx->state_unsaveable = FALSE;

     if (ctx->mech.pParameter) {

         free(ctx->mech.pParameter);

@@ -642,9 +644,14 @@ CK_RV decr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx)

     }

     if (ctx->context) {

-        free(ctx->context);

+        if (ctx->context_free_func != NULL)

+            ctx->context_free_func(tokdata, sess, ctx->context,

+                                   ctx->context_len);

+        else

+            free(ctx->context);

         ctx->context = NULL;

     }

+    ctx->context_free_func = NULL;

     return CKR_OK;

 }

diff --git a/usr/lib/common/dig_mgr.c b/usr/lib/common/dig_mgr.c

index 77cb60a1..222eee75 100644

--- a/usr/lib/common/dig_mgr.c

+++ b/usr/lib/common/dig_mgr.c

@@ -63,7 +63,7 @@ CK_RV digest_mgr_init(STDLL_TokData_t *tokdata,

         ctx->context = NULL;

         rc = sha_init(tokdata, sess, ctx, mech);

         if (rc != CKR_OK) {

-            digest_mgr_cleanup(ctx);    // to de-initialize context above

+            digest_mgr_cleanup(tokdata, sess, ctx);    // to de-initialize context above

             TRACE_ERROR("Failed to init sha context.\n");

             return rc;

         }

@@ -76,7 +76,7 @@ CK_RV digest_mgr_init(STDLL_TokData_t *tokdata,

         ctx->context_len = sizeof(MD2_CONTEXT);

         ctx->context = (CK_BYTE *) malloc(sizeof(MD2_CONTEXT));

         if (!ctx->context) {

-            digest_mgr_cleanup(ctx);    // to de-initialize context above

+            digest_mgr_cleanup(tokdata, sess, ctx);    // to de-initialize context above

             TRACE_ERROR("%s\n", ock_err(ERR_HOST_MEMORY));

             return CKR_HOST_MEMORY;

         }

@@ -90,7 +90,7 @@ CK_RV digest_mgr_init(STDLL_TokData_t *tokdata,

           ctx->context = NULL;

           rc = md5_init(tokdata, sess, ctx, mech);

           if (rc != CKR_OK) {

-              digest_mgr_cleanup(ctx);    // to de-initialize context above

+              digest_mgr_cleanup(tokdata, sess, ctx);    // to de-initialize context above

               TRACE_ERROR("Failed to init md5 context.\n");

               return rc;

           }

@@ -103,7 +103,7 @@ CK_RV digest_mgr_init(STDLL_TokData_t *tokdata,

     if (mech->ulParameterLen > 0 && mech->pParameter != NULL) {

         ptr = (CK_BYTE *) malloc(mech->ulParameterLen);

         if (!ptr) {

-            digest_mgr_cleanup(ctx);    // to de-initialize context above

+            digest_mgr_cleanup(tokdata, sess, ctx);    // to de-initialize context above

             TRACE_ERROR("%s\n", ock_err(ERR_HOST_MEMORY));

             return CKR_HOST_MEMORY;

         }

@@ -122,7 +122,8 @@ CK_RV digest_mgr_init(STDLL_TokData_t *tokdata,

 //

 //

-CK_RV digest_mgr_cleanup(DIGEST_CONTEXT *ctx)

+CK_RV digest_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                         DIGEST_CONTEXT *ctx)

 {

     if (!ctx) {

         TRACE_ERROR("Invalid function argument.\n");

@@ -134,6 +135,7 @@ CK_RV digest_mgr_cleanup(DIGEST_CONTEXT *ctx)

     ctx->multi = FALSE;

     ctx->active = FALSE;

     ctx->context_len = 0;

+    ctx->state_unsaveable = FALSE;

     if (ctx->mech.pParameter) {

         free(ctx->mech.pParameter);

@@ -141,9 +143,14 @@ CK_RV digest_mgr_cleanup(DIGEST_CONTEXT *ctx)

     }

     if (ctx->context != NULL) {

-        free(ctx->context);

+        if (ctx->context_free_func != NULL)

+            ctx->context_free_func(tokdata, sess, ctx->context,

+                                   ctx->context_len);

+        else

+            free(ctx->context);

         ctx->context = NULL;

     }

+    ctx->context_free_func = NULL;

     return CKR_OK;

 }

@@ -232,7 +239,7 @@ out:

         // unless it returns CKR_BUFFER_TOO_SMALL or is a successful call (i.e.,

         // one which returns CKR_OK) to determine the length of the buffer

         // needed to hold the message digest."

-        digest_mgr_cleanup(ctx);

+        digest_mgr_cleanup(tokdata, sess, ctx);

     }

     return rc;

@@ -301,7 +308,7 @@ CK_RV digest_mgr_digest_update(STDLL_TokData_t *tokdata,

 out:

     if (rc != CKR_OK) {

-        digest_mgr_cleanup(ctx);

+        digest_mgr_cleanup(tokdata, sess, ctx);

         // "A call to C_DigestUpdate which results in an error

         // terminates the current digest operation."

     }

@@ -373,7 +380,7 @@ CK_RV digest_mgr_digest_key(STDLL_TokData_t *tokdata,

 out:

     if (rc != CKR_OK) {

-        digest_mgr_cleanup(ctx);

+        digest_mgr_cleanup(tokdata, sess, ctx);

     }

     object_put(tokdata, key_obj, TRUE);

@@ -451,7 +458,7 @@ out:

         // operation unless it returns CKR_BUFFER_TOO_SMALL or is a successful

         // call (i.e., one which returns CKR_OK) to determine the length of the

         // buffer needed to hold the message digest."

-        digest_mgr_cleanup(ctx);

+        digest_mgr_cleanup(tokdata, sess, ctx);

     }

     return rc;

diff --git a/usr/lib/common/encr_mgr.c b/usr/lib/common/encr_mgr.c

index 3e85ceab..7f7dfbae 100644

--- a/usr/lib/common/encr_mgr.c

+++ b/usr/lib/common/encr_mgr.c

@@ -617,7 +617,8 @@ done:

 //

 //

-CK_RV encr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx)

+CK_RV encr_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                       ENCR_DECR_CONTEXT *ctx)

 {

     if (!ctx) {

         TRACE_ERROR("Invalid function argument.\n");

@@ -632,6 +633,7 @@ CK_RV encr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx)

     ctx->init_pending = FALSE;

     ctx->context_len = 0;

     ctx->pkey_active = FALSE;

+    ctx->state_unsaveable = FALSE;

     if (ctx->mech.pParameter) {

         free(ctx->mech.pParameter);

@@ -639,9 +641,14 @@ CK_RV encr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx)

     }

     if (ctx->context) {

-        free(ctx->context);

+        if (ctx->context_free_func != NULL)

+            ctx->context_free_func(tokdata, sess, ctx->context,

+                                   ctx->context_len);

+        else

+            free(ctx->context);

         ctx->context = NULL;

     }

+    ctx->context_free_func = NULL;

     return CKR_OK;

 }

@@ -1204,8 +1211,8 @@ done:

         free(decr_data);

     }

-    decr_mgr_cleanup(decr_ctx);

-    encr_mgr_cleanup(encr_ctx);

+    decr_mgr_cleanup(tokdata, sess, decr_ctx);

+    encr_mgr_cleanup(tokdata, sess, encr_ctx);

     return rc;

 }

diff --git a/usr/lib/common/h_extern.h b/usr/lib/common/h_extern.h

index 5e251d95..47b96ba0 100644

--- a/usr/lib/common/h_extern.h

+++ b/usr/lib/common/h_extern.h

@@ -1790,7 +1790,8 @@ CK_RV encr_mgr_init(STDLL_TokData_t *tokdata,

                     CK_ULONG operation,

                     CK_MECHANISM *mech, CK_OBJECT_HANDLE key_handle);

-CK_RV encr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx);

+CK_RV encr_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                       ENCR_DECR_CONTEXT *ctx);

 CK_RV encr_mgr_encrypt(STDLL_TokData_t *tokdata,

                        SESSION *sess, CK_BBOOL length_only,

@@ -1825,7 +1826,8 @@ CK_RV decr_mgr_init(STDLL_TokData_t *tokdata,

                     CK_ULONG operation,

                     CK_MECHANISM *mech, CK_OBJECT_HANDLE key_handle);

-CK_RV decr_mgr_cleanup(ENCR_DECR_CONTEXT *ctx);

+CK_RV decr_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                       ENCR_DECR_CONTEXT *ctx);

 CK_RV decr_mgr_decrypt(STDLL_TokData_t *tokdata,

                        SESSION *sess, CK_BBOOL length_only,

@@ -1866,7 +1868,8 @@ CK_RV decr_mgr_update_des3_cbc(STDLL_TokData_t *tokdata, SESSION *sess,

 // digest manager routines

 //

-CK_RV digest_mgr_cleanup(DIGEST_CONTEXT *ctx);

+CK_RV digest_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                         DIGEST_CONTEXT *ctx);

 CK_RV digest_mgr_init(STDLL_TokData_t *tokdata,

                       SESSION *sess,

@@ -1955,7 +1958,8 @@ CK_RV sign_mgr_init(STDLL_TokData_t *tokdata,

                     CK_MECHANISM *mech,

                     CK_BBOOL recover_mode, CK_OBJECT_HANDLE key_handle);

-CK_RV sign_mgr_cleanup(SIGN_VERIFY_CONTEXT *ctx);

+CK_RV sign_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                       SIGN_VERIFY_CONTEXT *ctx);

 CK_RV sign_mgr_sign(STDLL_TokData_t *tokdata,

                     SESSION *sess,

@@ -1992,7 +1996,8 @@ CK_RV verify_mgr_init(STDLL_TokData_t *tokdata,

                       CK_MECHANISM *mech,

                       CK_BBOOL recover_mode, CK_OBJECT_HANDLE key_handle);

-CK_RV verify_mgr_cleanup(SIGN_VERIFY_CONTEXT *ctx);

+CK_RV verify_mgr_cleanup(STDLL_TokData_t *tokdata, SESSION *sess,

+                         SIGN_VERIFY_CONTEXT *ctx);

 CK_RV verify_mgr_verify(STDLL_TokData_t *tokdata,

                         SESSION *sess,

@@ -2036,10 +2041,11 @@ CK_BBOOL session_mgr_so_session_exists(STDLL_TokData_t *tokdata);

 CK_BBOOL session_mgr_user_session_exists(STDLL_TokData_t *tokdata);

 CK_BBOOL session_mgr_public_session_exists(STDLL_TokData_t *tokdata);

-CK_RV session_mgr_get_op_state(SESSION *sess, CK_BBOOL length_only,

+CK_RV session_mgr_get_op_state(SESSION *sess,

+                               CK_BBOOL length_only,

                                CK_BYTE *data, CK_ULONG *data_len);

-CK_RV session_mgr_set_op_state(SESSION *sess,

+CK_RV session_mgr_set_op_state(STDLL_TokData_t *tokdata, SESSION *sess,

                                CK_OBJECT_HANDLE encr_key,

                                CK_OBJECT_HANDLE auth_key, CK_BYTE *data,

                                CK_ULONG data_len);

diff --git a/usr/lib/common/host_defs.h b/usr/lib/common/host_defs.h

index c0b5c83d..41fdb657 100644

--- a/usr/lib/common/host_defs.h

+++ b/usr/lib/common/host_defs.h

@@ -21,27 +21,36 @@

 #include "local_types.h"

+struct _SESSION;

+

+typedef void (*context_free_func_t)(STDLL_TokData_t *tokdata, struct _SESSION *sess,

+                                    CK_BYTE *context, CK_ULONG context_len);

+

 typedef struct _ENCR_DECR_CONTEXT {

     CK_OBJECT_HANDLE key;

     CK_MECHANISM mech;

     CK_BYTE *context;

     CK_ULONG context_len;

+    context_free_func_t context_free_func;

     CK_BBOOL multi;

     CK_BBOOL active;

     CK_BBOOL init_pending;      // indicate init request pending

     CK_BBOOL multi_init;        // multi field is initialized

                                 // on first call *after* init

     CK_BBOOL pkey_active;

+    CK_BBOOL state_unsaveable;

 } ENCR_DECR_CONTEXT;

 typedef struct _DIGEST_CONTEXT {

     CK_MECHANISM mech;

     CK_BYTE *context;

     CK_ULONG context_len;

+    context_free_func_t context_free_func;

     CK_BBOOL multi;

     CK_BBOOL active;

     CK_BBOOL multi_init;        // multi field is initialized

                                 // on first call *after* init

+    CK_BBOOL state_unsaveable;

 } DIGEST_CONTEXT;

 typedef struct _SIGN_VERIFY_CONTEXT {

@@ -49,6 +58,7 @@ typedef struct _SIGN_VERIFY_CONTEXT {

     CK_MECHANISM mech;          // current sign mechanism

     CK_BYTE *context;           // temporary work area

     CK_ULONG context_len;

+    context_free_func_t context_free_func;

     CK_BBOOL multi;             // is this a multi-part operation?

     CK_BBOOL recover;           // are we in recover mode?

     CK_BBOOL active;

@@ -56,6 +66,7 @@ typedef struct _SIGN_VERIFY_CONTEXT {

     CK_BBOOL multi_init;        // multi field is initialized

                                 // on first call *after* init

     CK_BBOOL pkey_active;

+    CK_BBOOL state_unsaveable;

 } SIGN_VERIFY_CONTEXT;

diff --git a/usr/lib/common/key_mgr.c b/usr/lib/common/key_mgr.c

index d9cd1f2f..aea74b7c 100644

--- a/usr/lib/common/key_mgr.c

+++ b/usr/lib/common/key_mgr.c

@@ -1011,7 +1011,7 @@ CK_RV key_mgr_wrap_key(STDLL_TokData_t *tokdata,

         OPENSSL_cleanse(data, data_len);

         free(data);

     }

-    encr_mgr_cleanup(ctx);

+    encr_mgr_cleanup(tokdata, sess, ctx);

     free(ctx);

 done:

@@ -1259,7 +1259,7 @@ CK_RV key_mgr_unwrap_key(STDLL_TokData_t *tokdata,

                           FALSE,

                           ctx, wrapped_key, wrapped_key_len, data, &data_len);

-    decr_mgr_cleanup(ctx);

+    decr_mgr_cleanup(tokdata, sess, ctx);

     free(ctx);

     ctx = NULL;

@@ -1345,7 +1345,7 @@ done:

         free(data);

     }

     if (ctx != NULL) {

-        decr_mgr_cleanup(ctx);

+        decr_mgr_cleanup(tokdata, sess, ctx);

         free(ctx);

     }

diff --git a/usr/lib/common/lock_sess_mgr.c b/usr/lib/common/lock_sess_mgr.c

index 0c7dbedf..0609a6c9 100644

--- a/usr/lib/common/lock_sess_mgr.c

+++ b/usr/lib/common/lock_sess_mgr.c

@@ -276,32 +276,62 @@ CK_RV session_mgr_close_session(STDLL_TokData_t *tokdata,

     if (sess->find_list)

         free(sess->find_list);

-    if (sess->encr_ctx.context)

-        free(sess->encr_ctx.context);

+    if (sess->encr_ctx.context) {

+        if (sess->encr_ctx.context_free_func != NULL)

+            sess->encr_ctx.context_free_func(tokdata, sess,

+                                             sess->encr_ctx.context,

+                                             sess->encr_ctx.context_len);

+        else

+            free(sess->encr_ctx.context);

+    }

     if (sess->encr_ctx.mech.pParameter)

         free(sess->encr_ctx.mech.pParameter);

-    if (sess->decr_ctx.context)

-        free(sess->decr_ctx.context);

+    if (sess->decr_ctx.context) {

+        if (sess->decr_ctx.context_free_func != NULL)

+            sess->decr_ctx.context_free_func(tokdata, sess,

+                                             sess->decr_ctx.context,

+                                             sess->decr_ctx.context_len);

+        else

+            free(sess->decr_ctx.context);

+    }

     if (sess->decr_ctx.mech.pParameter)

         free(sess->decr_ctx.mech.pParameter);

-    if (sess->digest_ctx.context)

-        free(sess->digest_ctx.context);

+    if (sess->digest_ctx.context) {

+        if (sess->digest_ctx.context_free_func != NULL)

+            sess->digest_ctx.context_free_func(tokdata, sess,

+                                               sess->digest_ctx.context,

+                                               sess->digest_ctx.context_len);

+        else

+            free(sess->digest_ctx.context);

+    }

     if (sess->digest_ctx.mech.pParameter)

         free(sess->digest_ctx.mech.pParameter);

-    if (sess->sign_ctx.context)

-        free(sess->sign_ctx.context);

+    if (sess->sign_ctx.context) {

+        if (sess->sign_ctx.context_free_func != NULL)

+            sess->sign_ctx.context_free_func(tokdata, sess,

+                                             sess->sign_ctx.context,

+                                             sess->sign_ctx.context_len);

+        else

+            free(sess->sign_ctx.context);

+    }

     if (sess->sign_ctx.mech.pParameter)

         free(sess->sign_ctx.mech.pParameter);

-    if (sess->verify_ctx.context)

-        free(sess->verify_ctx.context);

+    if (sess->verify_ctx.context) {

+        if (sess->verify_ctx.context_free_func != NULL)

+            sess->verify_ctx.context_free_func(tokdata, sess,

+                                               sess->verify_ctx.context,

+                                               sess->verify_ctx.context_len);

+        else

+            free(sess->verify_ctx.context);

+    }

     if (sess->verify_ctx.mech.pParameter)

         free(sess->verify_ctx.mech.pParameter);

@@ -354,32 +384,62 @@ void session_free(STDLL_TokData_t *tokdata, void *node_value,

     if (sess->find_list)

         free(sess->find_list);

-    if (sess->encr_ctx.context)

-        free(sess->encr_ctx.context);

+    if (sess->encr_ctx.context) {

+        if (sess->encr_ctx.context_free_func != NULL)

+            sess->encr_ctx.context_free_func(tokdata, sess,

+                                             sess->encr_ctx.context,

+                                             sess->encr_ctx.context_len);

+        else

+            free(sess->encr_ctx.context);

+    }

     if (sess->encr_ctx.mech.pParameter)

         free(sess->encr_ctx.mech.pParameter);

-    if (sess->decr_ctx.context)

-        free(sess->decr_ctx.context);

+    if (sess->decr_ctx.context) {

+        if (sess->decr_ctx.context_free_func != NULL)

+            sess->decr_ctx.context_free_func(tokdata, sess,

+                                             sess->decr_ctx.context,

+                                             sess->decr_ctx.context_len);

+        else

+            free(sess->decr_ctx.context);

+    }

     if (sess->decr_ctx.mech.pParameter)

         free(sess->decr_ctx.mech.pParameter);

-    if (sess->digest_ctx.context)

-        free(sess->digest_ctx.context);

+    if (sess->digest_ctx.context) {

+        if (sess->digest_ctx.context_free_func != NULL)

+            sess->digest_ctx.context_free_func(tokdata, sess,

+                                               sess->digest_ctx.context,

+                                               sess->digest_ctx.context_len);

+        else

+            free(sess->digest_ctx.context);

+    }

     if (sess->digest_ctx.mech.pParameter)

         free(sess->digest_ctx.mech.pParameter);

-    if (sess->sign_ctx.context)

-        free(sess->sign_ctx.context);

+    if (sess->sign_ctx.context) {

+        if (sess->sign_ctx.context_free_func != NULL)

+            sess->sign_ctx.context_free_func(tokdata, sess,

+                                             sess->sign_ctx.context,

+                                             sess->sign_ctx.context_len);

+        else

+            free(sess->sign_ctx.context);

+    }

     if (sess->sign_ctx.mech.pParameter)

         free(sess->sign_ctx.mech.pParameter);

-    if (sess->verify_ctx.context)

-        free(sess->verify_ctx.context);

+    if (sess->verify_ctx.context) {

+        if (sess->verify_ctx.context_free_func != NULL)

+            sess->verify_ctx.context_free_func(tokdata, sess,

+                                               sess->verify_ctx.context,

+                                               sess->verify_ctx.context_len);

+        else

+            free(sess->verify_ctx.context);

+    }

     if (sess->verify_ctx.mech.pParameter)

         free(sess->verify_ctx.mech.pParameter);

@@ -528,6 +588,10 @@ CK_RV session_mgr_get_op_state(SESSION *sess,

     active_ops = 0;

     if (sess->encr_ctx.active == TRUE) {

+        if (sess->encr_ctx.state_unsaveable) {

+            TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

+            return CKR_STATE_UNSAVEABLE;

+        }

         active_ops++;

         if (op_data != NULL) {

             TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

@@ -572,6 +636,10 @@ CK_RV session_mgr_get_op_state(SESSION *sess,

     }

     if (sess->decr_ctx.active == TRUE) {

+        if (sess->decr_ctx.state_unsaveable) {

+            TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

+            return CKR_STATE_UNSAVEABLE;

+        }

         active_ops++;

         if (op_data != NULL) {

             TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

@@ -616,6 +684,10 @@ CK_RV session_mgr_get_op_state(SESSION *sess,

     }

     if (sess->digest_ctx.active == TRUE) {

+        if (sess->digest_ctx.state_unsaveable) {

+            TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

+            return CKR_STATE_UNSAVEABLE;

+        }

         active_ops++;

         if (op_data != NULL) {

             TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

@@ -660,6 +732,10 @@ CK_RV session_mgr_get_op_state(SESSION *sess,

     }

     if (sess->sign_ctx.active == TRUE) {

+        if (sess->sign_ctx.state_unsaveable) {

+            TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

+            return CKR_STATE_UNSAVEABLE;

+        }

         active_ops++;

         if (op_data != NULL) {

             TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

@@ -704,6 +780,10 @@ CK_RV session_mgr_get_op_state(SESSION *sess,

     }

     if (sess->verify_ctx.active == TRUE) {

+        if (sess->verify_ctx.state_unsaveable) {

+            TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

+            return CKR_STATE_UNSAVEABLE;

+        }

         active_ops++;

         if (op_data != NULL) {

             TRACE_ERROR("%s\n", ock_err(ERR_STATE_UNSAVEABLE));

@@ -759,7 +839,7 @@ CK_RV session_mgr_get_op_state(SESSION *sess,

 //

 //

-CK_RV session_mgr_set_op_state(SESSION *sess,

+CK_RV session_mgr_set_op_state(STDLL_TokData_t *tokdata, SESSION *sess,

                                CK_OBJECT_HANDLE encr_key,

                                CK_OBJECT_HANDLE auth_key,

                                CK_BYTE *data, CK_ULONG data_len)

@@ -939,19 +1019,19 @@ CK_RV session_mgr_set_op_state(SESSION *sess,

     // state information looks okay.  cleanup the current session state, first

     //

     if (sess->encr_ctx.active)

-        encr_mgr_cleanup(&sess->encr_ctx);

+        encr_mgr_cleanup(tokdata, sess, &sess->encr_ctx);

     if (sess->decr_ctx.active)

-        decr_mgr_cleanup(&sess->decr_ctx);

+        decr_mgr_cleanup(tokdata, sess, &sess->decr_ctx);

     if (sess->digest_ctx.active)

-        digest_mgr_cleanup(&sess->digest_ctx);

+        digest_mgr_cleanup(tokdata, sess, &sess->digest_ctx);

     if (sess->sign_ctx.active)

-        sign_mgr_cleanup(&sess->sign_ctx);

+        sign_mgr_cleanup(tokdata, sess, &sess->sign_ctx);

     if (sess->verify_ctx.active)

-        verify_mgr_cleanup(&sess->verify_ctx);

+        verify_mgr_cleanup(tokdata, sess, &sess->verify_ctx);

     // copy the new state information

diff --git a/usr/lib/common/mech_aes.c b/usr/lib/common/mech_aes.c

index a117487d..ad6af16b 100644

--- a/usr/lib/common/mech_aes.c

+++ b/usr/lib/common/mech_aes.c

@@ -2740,6 +2740,9 @@ CK_RV aes_cmac_sign(STDLL_TokData_t *tokdata,

         goto done;

     }

+    if (((AES_CMAC_CONTEXT *)ctx->context)->ctx != NULL)

+        ctx->state_unsaveable = CK_TRUE;

+

     memcpy(out_data, ((AES_CMAC_CONTEXT *) ctx->context)->iv, mac_len);

     *out_data_len = mac_len;

@@ -2810,6 +2813,9 @@ CK_RV aes_cmac_sign_update(STDLL_TokData_t *tokdata,

             context->len = remain;

             context->initialized = CK_TRUE;

+

+            if (context->ctx != NULL)

+                ctx->state_unsaveable = CK_TRUE;

         } else {

             TRACE_DEVEL("Token specific aes cmac failed.\n");

         }

@@ -2873,6 +2879,9 @@ CK_RV aes_cmac_sign_final(STDLL_TokData_t *tokdata,

         goto done;

     }

+    if (context->ctx != NULL)

+        ctx->state_unsaveable = CK_TRUE;

+

     memcpy(out_data, context->iv, mac_len);

     *out_data_len = mac_len;

@@ -2929,6 +2938,9 @@ CK_RV aes_cmac_verify(STDLL_TokData_t *tokdata,

         return rc;

     }

+    if (((AES_CMAC_CONTEXT *)ctx->context)->ctx != NULL)

+        ctx->state_unsaveable = CK_TRUE;

+

     if (CRYPTO_memcmp(out_data, ((AES_CMAC_CONTEXT *) ctx->context)->iv,

                       out_data_len) == 0) {

         return CKR_OK;

@@ -2997,6 +3009,9 @@ CK_RV aes_cmac_verify_update(STDLL_TokData_t *tokdata,

             context->len = remain;

             context->initialized = CK_TRUE;

+

+            if (context->ctx != NULL)

+                ctx->state_unsaveable = CK_TRUE;

         } else {

             TRACE_DEVEL("Token specific aes cmac failed.\n");

         }

@@ -3052,6 +3067,9 @@ CK_RV aes_cmac_verify_final(STDLL_TokData_t *tokdata,

     object_put(tokdata, key_obj, TRUE);

     key_obj = NULL;

+    if (context->ctx != NULL)

+        ctx->state_unsaveable = CK_TRUE;

+

     if (rc != CKR_OK) {

         TRACE_DEVEL("Token specific aes mac failed.\n");

         return rc;

diff --git a/usr/lib/common/mech_des3.c b/usr/lib/common/mech_des3.c

index 786f9a4a..be8d6075 100644

--- a/usr/lib/common/mech_des3.c

+++ b/usr/lib/common/mech_des3.c

@@ -2380,6 +2380,9 @@ CK_RV des3_cmac_sign(STDLL_TokData_t *tokdata,

     if (rc != CKR_OK)

         TRACE_DEVEL("Token specific des3 cmac failed.\n");

+    if (((DES_CMAC_CONTEXT *)ctx->context)->ctx != NULL)

+        ctx->state_unsaveable = CK_TRUE;

+

     memcpy(out_data, ((DES_CMAC_CONTEXT *) ctx->context)->iv, mac_len);

     *out_data_len = mac_len;

@@ -2450,6 +2453,9 @@ CK_RV des3_cmac_sign_update(STDLL_TokData_t *tokdata,

             context->len = remain;

             context->initialized = CK_TRUE;

+

+            if (context->ctx != NULL)

+                ctx->state_unsaveable = CK_TRUE;

         } else {

             TRACE_DEVEL("Token specific des3 cmac failed.\n");

         }

@@ -2512,6 +2518,9 @@ CK_RV des3_cmac_sign_final(STDLL_TokData_t *tokdata,

         goto done;

     }

+    if (context->ctx != NULL)

+        ctx->state_unsaveable = CK_TRUE;

+

     memcpy(out_data, context->iv, mac_len);

     *out_data_len = mac_len;

@@ -2565,6 +2574,9 @@ CK_RV des3_cmac_verify(STDLL_TokData_t *tokdata,

     object_put(tokdata, key_obj, TRUE);

     key_obj = NULL;