diff options
| author | Robert Relyea <rrelyea@redhat.com> | 2021-04-29 09:40:32 -0700 |
|---|---|---|
| committer | Robert Relyea <rrelyea@redhat.com> | 2021-04-29 09:40:32 -0700 |
| commit | 1d7cfb995f80a079a8ab04b32f92de8ef4e99813 (patch) | |
| tree | 576f546a1aaa205d6d37a296ab6f8ebe53188873 | |
| parent | 674e421abbb469ac3a78156f1a720c3353733895 (diff) | |
| download | nss-hg-1d7cfb995f80a079a8ab04b32f92de8ef4e99813.tar.gz | |
Fix bad merge of PSS patch
| -rw-r--r-- | lib/pk11wrap/pk11cxt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pk11wrap/pk11cxt.c b/lib/pk11wrap/pk11cxt.c index 9deff08d5..3e80e8754 100644 --- a/lib/pk11wrap/pk11cxt.c +++ b/lib/pk11wrap/pk11cxt.c @@ -174,7 +174,7 @@ pk11_contextInitMessage(PK11Context *context, CK_MECHANISM_PTR mech, if ((version.major >= 3) && PK11_DoesMechanismFlag(slot, (mech)->mechanism, flags)) { PK11_EnterContextMonitor(context); - crv = (*initFunc)((context)->session, (mech), (key)->objectID); + crv = (*initFunc)((context)->session, (mech), (context)->objectID); PK11_ExitContextMonitor(context); if ((crv == CKR_FUNCTION_NOT_SUPPORTED) || (crv == CKR_MECHANISM_INVALID)) { @@ -203,7 +203,7 @@ pk11_context_init(PK11Context *context, CK_MECHANISM *mech_info) switch (context->operation) { case CKA_ENCRYPT: PK11_EnterContextMonitor(context); - crv = PK11_GETTAB(context->slot)->C_EncryptInit(context->session, mech_info, symKey->objectID); + crv = PK11_GETTAB(context->slot)->C_EncryptInit(context->session, mech_info, context->objectID); PK11_ExitContextMonitor(context); break; case CKA_DECRYPT: @@ -225,7 +225,7 @@ pk11_context_init(PK11Context *context, CK_MECHANISM *mech_info) break; case CKA_SIGN: PK11_EnterContextMonitor(context); - crv = PK11_GETTAB(context->slot)->C_SignInit(context->session, mech_info, symKey->objectID); + crv = PK11_GETTAB(context->slot)->C_SignInit(context->session, mech_info, context->objectID); PK11_ExitContextMonitor(context); break; case CKA_VERIFY: |