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

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

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 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
OLDNEW
1 /* 1 /*
2 * Function to set error code only when meaningful error has not already 2 * Function to set error code only when meaningful error has not already
3 * been set. 3 * been set.
4 * 4 *
5 * This Source Code Form is subject to the terms of the Mozilla Public 5 * This Source Code Form is subject to the terms of the Mozilla Public
6 * License, v. 2.0. If a copy of the MPL was not distributed with this 6 * License, v. 2.0. If a copy of the MPL was not distributed with this
7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
8 /* $Id: sslerr.c,v 1.5 2012/04/25 14:50:12 gerv%gerv.net Exp $ */ 8 /* $Id$ */
9 9
10 #include "prerror.h" 10 #include "prerror.h"
11 #include "secerr.h" 11 #include "secerr.h"
12 #include "sslerr.h" 12 #include "sslerr.h"
13 #include "seccomon.h" 13 #include "seccomon.h"
14 14
15 /* look at the current value of PR_GetError, and evaluate it to see 15 /* look at the current value of PR_GetError, and evaluate it to see
16 * if it is meaningful or meaningless (out of context). 16 * if it is meaningful or meaningless (out of context).
17 * If it is meaningless, replace it with the hiLevelError. 17 * If it is meaningless, replace it with the hiLevelError.
18 * Returns the chosen error value. 18 * Returns the chosen error value.
(...skipping 14 matching lines...) Expand all
33 case SSL_ERROR_BAD_CLIENT: 33 case SSL_ERROR_BAD_CLIENT:
34 case SSL_ERROR_BAD_SERVER: 34 case SSL_ERROR_BAD_SERVER:
35 case SSL_ERROR_SESSION_NOT_FOUND: 35 case SSL_ERROR_SESSION_NOT_FOUND:
36 PORT_SetError(hiLevelError); 36 PORT_SetError(hiLevelError);
37 return hiLevelError; 37 return hiLevelError;
38 38
39 default: /* leave the majority of error codes alone. */ 39 default: /* leave the majority of error codes alone. */
40 return oldErr; 40 return oldErr;
41 } 41 }
42 } 42 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698