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

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

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/patches/versionskew.patch ('k') | net/third_party/nss/ssl/ssl3con.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 * This file contains prototypes for the public SSL functions. 2 * This file contains prototypes for the public SSL 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 #ifndef __ssl_h_ 8 #ifndef __ssl_h_
9 #define __ssl_h_ 9 #define __ssl_h_
10 10
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 359
360 /* Returns, in |*vrange|, the range of enabled SSL3/TLS versions for |fd|. */ 360 /* Returns, in |*vrange|, the range of enabled SSL3/TLS versions for |fd|. */
361 SSL_IMPORT SECStatus SSL_VersionRangeGet(PRFileDesc *fd, 361 SSL_IMPORT SECStatus SSL_VersionRangeGet(PRFileDesc *fd,
362 SSLVersionRange *vrange); 362 SSLVersionRange *vrange);
363 363
364 /* Sets the range of enabled SSL3/TLS versions for |fd| to |*vrange|. */ 364 /* Sets the range of enabled SSL3/TLS versions for |fd| to |*vrange|. */
365 SSL_IMPORT SECStatus SSL_VersionRangeSet(PRFileDesc *fd, 365 SSL_IMPORT SECStatus SSL_VersionRangeSet(PRFileDesc *fd,
366 const SSLVersionRange *vrange); 366 const SSLVersionRange *vrange);
367 367
368 368
369 /* Values for "policy" argument to SSL_PolicySet */ 369 /* Values for "policy" argument to SSL_CipherPolicySet */
370 /* Values returned by SSL_CipherPolicyGet. */ 370 /* Values returned by SSL_CipherPolicyGet. */
371 #define SSL_NOT_ALLOWED 0 /* or invalid or unimplemented */ 371 #define SSL_NOT_ALLOWED 0 /* or invalid or unimplemented */
372 #define SSL_ALLOWED 1 372 #define SSL_ALLOWED 1
373 #define SSL_RESTRICTED 2 /* only with "Step-Up" certs. */ 373 #define SSL_RESTRICTED 2 /* only with "Step-Up" certs. */
374 374
375 /* Values for "on" with SSL_REQUIRE_CERTIFICATE. */ 375 /* Values for "on" with SSL_REQUIRE_CERTIFICATE. */
376 #define SSL_REQUIRE_NEVER ((PRBool)0) 376 #define SSL_REQUIRE_NEVER ((PRBool)0)
377 #define SSL_REQUIRE_ALWAYS ((PRBool)1) 377 #define SSL_REQUIRE_ALWAYS ((PRBool)1)
378 #define SSL_REQUIRE_FIRST_HANDSHAKE ((PRBool)2) 378 #define SSL_REQUIRE_FIRST_HANDSHAKE ((PRBool)2)
379 #define SSL_REQUIRE_NO_ERROR ((PRBool)3) 379 #define SSL_REQUIRE_NO_ERROR ((PRBool)3)
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 */ 957 */
958 SSL_IMPORT SECStatus NSS_CmpCertChainWCANames(CERTCertificate *cert, 958 SSL_IMPORT SECStatus NSS_CmpCertChainWCANames(CERTCertificate *cert,
959 CERTDistNames *caNames); 959 CERTDistNames *caNames);
960 960
961 /* 961 /*
962 * Returns key exchange type of the keys in an SSL server certificate. 962 * Returns key exchange type of the keys in an SSL server certificate.
963 */ 963 */
964 SSL_IMPORT SSLKEAType NSS_FindCertKEAType(CERTCertificate * cert); 964 SSL_IMPORT SSLKEAType NSS_FindCertKEAType(CERTCertificate * cert);
965 965
966 /* Set cipher policies to a predefined Domestic (U.S.A.) policy. 966 /* Set cipher policies to a predefined Domestic (U.S.A.) policy.
967 * This essentially enables all supported ciphers. 967 * This essentially allows all supported ciphers.
968 */ 968 */
969 SSL_IMPORT SECStatus NSS_SetDomesticPolicy(void); 969 SSL_IMPORT SECStatus NSS_SetDomesticPolicy(void);
970 970
971 /* Set cipher policies to a predefined Policy that is exportable from the USA 971 /* Set cipher policies to a predefined Policy that is exportable from the USA
972 * according to present U.S. policies as we understand them. 972 * according to present U.S. policies as we understand them.
973 * See documentation for the list. 973 * It is the same as NSS_SetDomesticPolicy now.
974 * Note that your particular application program may be able to obtain
975 * an export license with more or fewer capabilities than those allowed
976 * by this function. In that case, you should use SSL_SetPolicy()
977 * to explicitly allow those ciphers you may legally export.
978 */ 974 */
979 SSL_IMPORT SECStatus NSS_SetExportPolicy(void); 975 SSL_IMPORT SECStatus NSS_SetExportPolicy(void);
980 976
981 /* Set cipher policies to a predefined Policy that is exportable from the USA 977 /* Set cipher policies to a predefined Policy that is exportable from the USA
982 * according to present U.S. policies as we understand them, and that the 978 * according to present U.S. policies as we understand them, and that the
983 * nation of France will permit to be imported into their country. 979 * nation of France will permit to be imported into their country.
984 * See documentation for the list. 980 * It is the same as NSS_SetDomesticPolicy now.
985 */ 981 */
986 SSL_IMPORT SECStatus NSS_SetFrancePolicy(void); 982 SSL_IMPORT SECStatus NSS_SetFrancePolicy(void);
987 983
988 SSL_IMPORT SSL3Statistics * SSL_GetStatistics(void); 984 SSL_IMPORT SSL3Statistics * SSL_GetStatistics(void);
989 985
990 /* Report more information than SSL_SecurityStatus. 986 /* Report more information than SSL_SecurityStatus.
991 ** Caller supplies the info struct. Function fills it in. 987 ** Caller supplies the info struct. Function fills it in.
992 */ 988 */
993 SSL_IMPORT SECStatus SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, 989 SSL_IMPORT SECStatus SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info,
994 PRUintn len); 990 PRUintn len);
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1172 * should continue using the connection. If the application passes a non-zero 1168 * should continue using the connection. If the application passes a non-zero
1173 * value for second argument (error), or if SSL_AuthCertificateComplete returns 1169 * value for second argument (error), or if SSL_AuthCertificateComplete returns
1174 * anything other than SECSuccess, then the application should close the 1170 * anything other than SECSuccess, then the application should close the
1175 * connection. 1171 * connection.
1176 */ 1172 */
1177 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd, 1173 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd,
1178 PRErrorCode error); 1174 PRErrorCode error);
1179 SEC_END_PROTOS 1175 SEC_END_PROTOS
1180 1176
1181 #endif /* __ssl_h_ */ 1177 #endif /* __ssl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/versionskew.patch ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698