This commit is contained in:
jpierre%netscape.com 2004-06-18 02:03:30 +00:00
Родитель e8c134e6c5
Коммит 65862c5e4f
1 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@ -37,7 +37,7 @@
/*
* Stuff specific to S/MIME policy and interoperability.
*
* $Id: smimeutil.c,v 1.15 2004/06/18 00:38:44 jpierre%netscape.com Exp $
* $Id: smimeutil.c,v 1.16 2004/06/18 02:03:30 jpierre%netscape.com Exp $
*/
#include "secmime.h"
@ -424,7 +424,8 @@ smime_choose_cipher(CERTCertificate *scert, CERTCertificate **rcerts)
/* we have a profile (still DER-encoded) */
caps = NULL;
/* decode it */
if (SEC_QuickDERDecodeItem(poolp, &caps, NSSSMIMECapabilitiesTemplate, profile) == SECSuccess &&
if (SEC_QuickDERDecodeItem(poolp, &caps,
NSSSMIMECapabilitiesTemplate, profile) == SECSuccess &&
caps != NULL)
{
/* walk the SMIME capabilities for this recipient */
@ -737,7 +738,8 @@ NSS_SMIMEUtil_GetCertFromEncryptionKeyPreference(CERTCertDBHandle *certdb, SECIt
return NULL;
/* decode DERekp */
if (SEC_QuickDERDecodeItem(tmppoolp, &ekp, smime_encryptionkeypref_template, DERekp) != SECSuccess)
if (SEC_QuickDERDecodeItem(tmppoolp, &ekp, smime_encryptionkeypref_template,
DERekp) != SECSuccess)
goto loser;
/* find cert */