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

Side by Side Diff: net/third_party/nss/ssl/sslinit.c

Issue 111853013: Update net/third_party/nss to NSS 3.15.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Update the comment in sslenum.c for the two CHACHA20 cipher suites Created 6 years, 11 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 | « net/third_party/nss/ssl/sslimpl.h ('k') | net/third_party/nss/ssl/sslnonce.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 /* 1 /*
2 * NSS utility functions 2 * NSS utility functions
3 * 3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 7
8 #include "prtypes.h" 8 #include "prtypes.h"
9 #include "prinit.h" 9 #include "prinit.h"
10 #include "seccomon.h" 10 #include "seccomon.h"
11 #include "secerr.h" 11 #include "secerr.h"
12 #include "ssl.h" 12 #include "ssl.h"
13 #include "sslimpl.h" 13 #include "sslimpl.h"
14 14
15 static int ssl_inited = 0; 15 static int ssl_inited = 0;
16 16
17 SECStatus 17 SECStatus
18 ssl_Init(void) 18 ssl_Init(void)
19 { 19 {
20 if (!ssl_inited) { 20 if (!ssl_inited) {
21 if (ssl_InitializePRErrorTable() != SECSuccess) { 21 if (ssl_InitializePRErrorTable() != SECSuccess) {
22 PORT_SetError(SEC_ERROR_NO_MEMORY); 22 PORT_SetError(SEC_ERROR_NO_MEMORY);
23 return (SECFailure); 23 return (SECFailure);
24 } 24 }
25
26 #ifdef DEBUG
27 ssl3_CheckCipherSuiteOrderConsistency();
28 #endif
29
25 ssl_inited = 1; 30 ssl_inited = 1;
26 } 31 }
27 return SECSuccess; 32 return SECSuccess;
28 } 33 }
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslimpl.h ('k') | net/third_party/nss/ssl/sslnonce.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698