Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: nss/lib/pkcs7/secmime.c

Issue 16132005: Allow NSS to be built with NO_NSPR_10_SUPPORT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « nss/lib/pkcs7/p7local.c ('k') | nss/lib/pki/pki3hack.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 4
5 /* 5 /*
6 * Stuff specific to S/MIME policy and interoperability. 6 * Stuff specific to S/MIME policy and interoperability.
7 * Depends on PKCS7, but there should be no dependency the other way around. 7 * Depends on PKCS7, but there should be no dependency the other way around.
8 */ 8 */
9 9
10 #include "secmime.h" 10 #include "secmime.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 cipher = smime_cipher_maps[i].cipher; 354 cipher = smime_cipher_maps[i].cipher;
355 355
356 cap->cipher = cipher; 356 cap->cipher = cipher;
357 cap->capIDTag = algtag; 357 cap->capIDTag = algtag;
358 } 358 }
359 359
360 360
361 static long 361 static long
362 smime_choose_cipher (CERTCertificate *scert, CERTCertificate **rcerts) 362 smime_choose_cipher (CERTCertificate *scert, CERTCertificate **rcerts)
363 { 363 {
364 PRArenaPool *poolp; 364 PLArenaPool *poolp;
365 long chosen_cipher; 365 long chosen_cipher;
366 int *cipher_abilities; 366 int *cipher_abilities;
367 int *cipher_votes; 367 int *cipher_votes;
368 int strong_mapi; 368 int strong_mapi;
369 int rcount, mapi, max; 369 int rcount, mapi, max;
370 370
371 if (smime_policy_bits == 0) { 371 if (smime_policy_bits == 0) {
372 PORT_SetError (SEC_ERROR_BAD_EXPORT_ALGORITHM); 372 PORT_SetError (SEC_ERROR_BAD_EXPORT_ALGORITHM);
373 return -1; 373 return -1;
374 } 374 }
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 813
814 /* 814 /*
815 * Add the email profile. Again, if it fails for some reason, 815 * Add the email profile. Again, if it fails for some reason,
816 * may as well not give up altogether -- just assert. 816 * may as well not give up altogether -- just assert.
817 */ 817 */
818 rv = smime_add_profile (ecert, cinfo); 818 rv = smime_add_profile (ecert, cinfo);
819 PORT_Assert (rv == SECSuccess); 819 PORT_Assert (rv == SECSuccess);
820 820
821 return cinfo; 821 return cinfo;
822 } 822 }
OLDNEW
« no previous file with comments | « nss/lib/pkcs7/p7local.c ('k') | nss/lib/pki/pki3hack.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698