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

Side by Side Diff: net/third_party/nss/ssl/ssl.h

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 years, 1 month 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/prelib.c ('k') | net/third_party/nss/ssl/ssl.rc » ('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 * This file contains prototypes for the public SSL functions. 2 * This file contains prototypes for the public SSL functions.
3 * 3 *
4 * ***** BEGIN LICENSE BLOCK ***** 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 * The contents of this file are subject to the Mozilla Public License Version 7 /* $Id: ssl.h,v 1.59 2012/09/21 21:58:43 wtc%google.com Exp $ */
8 * 1.1 (the "License"); you may not use this file except in compliance with
9 * the License. You may obtain a copy of the License at
10 * http://www.mozilla.org/MPL/
11 *
12 * Software distributed under the License is distributed on an "AS IS" basis,
13 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
14 * for the specific language governing rights and limitations under the
15 * License.
16 *
17 * The Original Code is the Netscape security libraries.
18 *
19 * The Initial Developer of the Original Code is
20 * Netscape Communications Corporation.
21 * Portions created by the Initial Developer are Copyright (C) 1994-2000
22 * the Initial Developer. All Rights Reserved.
23 *
24 * Contributor(s):
25 *
26 * Alternatively, the contents of this file may be used under the terms of
27 * either the GNU General Public License Version 2 or later (the "GPL"), or
28 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
29 * in which case the provisions of the GPL or the LGPL are applicable instead
30 * of those above. If you wish to allow use of your version of this file only
31 * under the terms of either the GPL or the LGPL, and not to allow others to
32 * use your version of this file under the terms of the MPL, indicate your
33 * decision by deleting the provisions above and replace them with the notice
34 * and other provisions required by the GPL or the LGPL. If you do not delete
35 * the provisions above, a recipient may use your version of this file under
36 * the terms of any one of the MPL, the GPL or the LGPL.
37 *
38 * ***** END LICENSE BLOCK ***** */
39 /* $Id: ssl.h,v 1.54 2012/03/18 00:31:19 wtc%google.com Exp $ */
40 8
41 #ifndef __ssl_h_ 9 #ifndef __ssl_h_
42 #define __ssl_h_ 10 #define __ssl_h_
43 11
44 #include "prtypes.h" 12 #include "prtypes.h"
45 #include "prerror.h" 13 #include "prerror.h"
46 #include "prio.h" 14 #include "prio.h"
47 #include "seccomon.h" 15 #include "seccomon.h"
48 #include "cert.h" 16 #include "cert.h"
49 #include "keyt.h" 17 #include "keyt.h"
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 SSL_IMPORT SECStatus DTLS_GetHandshakeTimeout(PRFileDesc *socket, 992 SSL_IMPORT SECStatus DTLS_GetHandshakeTimeout(PRFileDesc *socket,
1025 PRIntervalTime *timeout); 993 PRIntervalTime *timeout);
1026 994
1027 /* 995 /*
1028 * Return a boolean that indicates whether the underlying library 996 * Return a boolean that indicates whether the underlying library
1029 * will perform as the caller expects. 997 * will perform as the caller expects.
1030 * 998 *
1031 * The only argument is a string, which should be the version 999 * The only argument is a string, which should be the version
1032 * identifier of the NSS library. That string will be compared 1000 * identifier of the NSS library. That string will be compared
1033 * against a string that represents the actual build version of 1001 * against a string that represents the actual build version of
1034 * the SSL library. It also invokes the version checking functions 1002 * the SSL library.
1035 * of the dependent libraries such as NSPR.
1036 */ 1003 */
1037 extern PRBool NSSSSL_VersionCheck(const char *importedVersion); 1004 extern PRBool NSSSSL_VersionCheck(const char *importedVersion);
1038 1005
1039 /* 1006 /*
1040 * Returns a const string of the SSL library version. 1007 * Returns a const string of the SSL library version.
1041 */ 1008 */
1042 extern const char *NSSSSL_GetVersion(void); 1009 extern const char *NSSSSL_GetVersion(void);
1043 1010
1044 /* Restart an SSL connection that was paused to do asynchronous certificate 1011 /* Restart an SSL connection that was paused to do asynchronous certificate
1045 * chain validation (when the auth certificate hook or bad cert handler 1012 * chain validation (when the auth certificate hook or bad cert handler
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 * should continue using the connection. If the application passes a non-zero 1067 * should continue using the connection. If the application passes a non-zero
1101 * value for second argument (error), or if SSL_AuthCertificateComplete returns 1068 * value for second argument (error), or if SSL_AuthCertificateComplete returns
1102 * anything other than SECSuccess, then the application should close the 1069 * anything other than SECSuccess, then the application should close the
1103 * connection. 1070 * connection.
1104 */ 1071 */
1105 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd, 1072 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd,
1106 PRErrorCode error); 1073 PRErrorCode error);
1107 SEC_END_PROTOS 1074 SEC_END_PROTOS
1108 1075
1109 #endif /* __ssl_h_ */ 1076 #endif /* __ssl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/prelib.c ('k') | net/third_party/nss/ssl/ssl.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698