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

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

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 years, 8 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
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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 unsigned long cipher; /* local; not part of encoding */ 298 unsigned long cipher; /* local; not part of encoding */
299 SECOidTag capIDTag; /* local; not part of encoding */ 299 SECOidTag capIDTag; /* local; not part of encoding */
300 SECItem capabilityID; 300 SECItem capabilityID;
301 SECItem parameters; 301 SECItem parameters;
302 } smime_capability; 302 } smime_capability;
303 303
304 static const SEC_ASN1Template smime_capability_template[] = { 304 static const SEC_ASN1Template smime_capability_template[] = {
305 { SEC_ASN1_SEQUENCE, 305 { SEC_ASN1_SEQUENCE,
306 0, NULL, sizeof(smime_capability) }, 306 0, NULL, sizeof(smime_capability) },
307 { SEC_ASN1_OBJECT_ID, 307 { SEC_ASN1_OBJECT_ID,
308 » offsetof(smime_capability,capabilityID), }, 308 » offsetof(smime_capability,capabilityID) },
309 { SEC_ASN1_OPTIONAL | SEC_ASN1_ANY, 309 { SEC_ASN1_OPTIONAL | SEC_ASN1_ANY,
310 » offsetof(smime_capability,parameters), }, 310 » offsetof(smime_capability,parameters) },
311 { 0, } 311 { 0 }
312 }; 312 };
313 313
314 static const SEC_ASN1Template smime_capabilities_template[] = { 314 static const SEC_ASN1Template smime_capabilities_template[] = {
315 { SEC_ASN1_SEQUENCE_OF, 0, smime_capability_template } 315 { SEC_ASN1_SEQUENCE_OF, 0, smime_capability_template }
316 }; 316 };
317 317
318 318
319 319
320 static void 320 static void
321 smime_fill_capability (smime_capability *cap) 321 smime_fill_capability (smime_capability *cap)
(...skipping 491 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/certificate.c » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698