Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/smime/cms.h

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 19 matching lines @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
  * Interfaces of the CMS implementation.
  *
- * $Id: cms.h,v 1.22 2008/06/14 14:20:31 wtc%google.com Exp $
+ * $Id: cms.h,v 1.23 2010/04/25 23:37:38 nelson%bolyard.com Exp $
  */
 
 #ifndef _CMS_H_
 #define _CMS_H_
 
 #include "seccomon.h"
 
 #include "secoidt.h"
 #include "certt.h"
 #include "keyt.h"
@@ skipping 676 matching lines @@
  * NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs - add a SMIMEEncryptionKeyPreferences attribute to the
  * authenticated (i.e. signed) attributes of "signerinfo".
  *
  * This is expected to be included in outgoing signed messages for email (S/MIME).
  */
 SECStatus
 NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs(NSSCMSSignerInfo *signerinfo, CERTCertificate *cert, CERTCertDBHandle *certdb);
 
 /*
  * NSS_CMSSignerInfo_AddMSSMIMEEncKeyPrefs - add a SMIMEEncryptionKeyPreferences attribute to the
- * authenticated (i.e. signed) attributes of "signerinfo", using the OID prefered by Microsoft.
+ * authenticated (i.e. signed) attributes of "signerinfo", using the OID preferred by Microsoft.
  *
  * This is expected to be included in outgoing signed messages for email (S/MIME),
  * if compatibility with Microsoft mail clients is wanted.
  */
 SECStatus
 NSS_CMSSignerInfo_AddMSSMIMEEncKeyPrefs(NSSCMSSignerInfo *signerinfo, CERTCertificate *cert, CERTCertDBHandle *certdb);
 
 /* 
  * NSS_CMSSignerInfo_AddCounterSignature - countersign a signerinfo
  */
@@ skipping 377 matching lines @@
  */
 extern SECStatus
 NSS_CMSDEREncode(NSSCMSMessage *cmsg, SECItem *input, SECItem *derOut, 
                  PLArenaPool *arena);
 
 
 /************************************************************************/
 SEC_END_PROTOS
 
 #endif /* _CMS_H_ */