From 78ac1b91a3a3de5fc7e80833e2901425262b6edc Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Thu, 21 Oct 2010 14:42:26 -0400 Subject: [PATCH 065/150] - we don't embed the signed data here - use the right OID for the encryption type --- src/plugins/preauth/pkinit/pkinit_crypto_nss.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c index 47e2d40..a233564 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c @@ -3071,7 +3071,6 @@ crypto_signeddata_common_create(krb5_context context, pkinit_req_crypto_context req_cryptoctx, pkinit_identity_crypto_context id_cryptoctx, NSSCMSMessage *msg, - NSSCMSContentInfo *info, SECOidTag digest, PRBool add_signed_attributes, NSSCMSSignedData **signed_data) @@ -3185,7 +3184,7 @@ cms_envelopeddata_create(krb5_context context, /* Create an enveloped-data pointer and set it as the message's * contents. */ - env = NSS_CMSEnvelopedData_Create(msg, SEC_OID_CMS_3DES_KEY_WRAP, 0); + env = NSS_CMSEnvelopedData_Create(msg, SEC_OID_DES_EDE3_CBC, 0); if (env == NULL) { PORT_FreeArena(pool, PR_TRUE); return ENOMEM; @@ -3236,7 +3235,6 @@ cms_envelopeddata_create(krb5_context context, req_cryptoctx, id_cryptoctx, msg, - info, digest, add_signed_attributes, &sdata) != 0) || @@ -3586,7 +3584,6 @@ cms_signeddata_create(krb5_context context, req_cryptoctx, id_cryptoctx, msg, - info, digest, add_signed_attributes, &sdata) != 0) || -- 1.7.6.4