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

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

Issue 7464031: net: add NSS support for RFC 5705 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years, 5 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/secret_exporter.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 * ***** BEGIN LICENSE BLOCK ***** 4 * ***** BEGIN LICENSE BLOCK *****
5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
6 * 6 *
7 * The contents of this file are subject to the Mozilla Public License Version 7 * The contents of this file are subject to the Mozilla Public License Version
8 * 1.1 (the "License"); you may not use this file except in compliance with 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 9 * the License. You may obtain a copy of the License at
10 * http://www.mozilla.org/MPL/ 10 * http://www.mozilla.org/MPL/
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 ** Caller supplies the info struct. Function fills it in. 679 ** Caller supplies the info struct. Function fills it in.
680 */ 680 */
681 SSL_IMPORT SECStatus SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, 681 SSL_IMPORT SECStatus SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info,
682 PRUintn len); 682 PRUintn len);
683 SSL_IMPORT SECStatus SSL_GetCipherSuiteInfo(PRUint16 cipherSuite, 683 SSL_IMPORT SECStatus SSL_GetCipherSuiteInfo(PRUint16 cipherSuite,
684 SSLCipherSuiteInfo *info, PRUintn len); 684 SSLCipherSuiteInfo *info, PRUintn len);
685 685
686 /* Returnes negotiated through SNI host info. */ 686 /* Returnes negotiated through SNI host info. */
687 SSL_IMPORT SECItem *SSL_GetNegotiatedHostInfo(PRFileDesc *fd); 687 SSL_IMPORT SECItem *SSL_GetNegotiatedHostInfo(PRFileDesc *fd);
688 688
689 /* Export keying material according to RFC 5705.
690 ** fd must correspond to a TLS 1.0 or higher socket and out must
691 ** already be allocated.
692 */
693 SSL_IMPORT SECStatus SSL_ExportKeyingMaterial(PRFileDesc *fd,
694 const char *label,
695 const unsigned char *context,
696 unsigned int contextlen,
697 unsigned char *out,
698 unsigned int outlen);
wtc 2011/07/22 17:33:17 I suggest that we specify the label as const c
699
689 /* 700 /*
690 ** Return a new reference to the certificate that was most recently sent 701 ** Return a new reference to the certificate that was most recently sent
691 ** to the peer on this SSL/TLS connection, or NULL if none has been sent. 702 ** to the peer on this SSL/TLS connection, or NULL if none has been sent.
692 */ 703 */
693 SSL_IMPORT CERTCertificate * SSL_LocalCertificate(PRFileDesc *fd); 704 SSL_IMPORT CERTCertificate * SSL_LocalCertificate(PRFileDesc *fd);
694 705
695 /* Test an SSL configuration to see if SSL_BYPASS_PKCS11 can be turned on. 706 /* Test an SSL configuration to see if SSL_BYPASS_PKCS11 can be turned on.
696 ** Check the key exchange algorithm for each cipher in the list to see if 707 ** Check the key exchange algorithm for each cipher in the list to see if
697 ** a master secret key can be extracted after being derived with the mechanism 708 ** a master secret key can be extracted after being derived with the mechanism
698 ** required by the protocolmask argument. If the KEA will use keys from the 709 ** required by the protocolmask argument. If the KEA will use keys from the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 SSLExtensionType extId, 742 SSLExtensionType extId,
732 PRBool *yes); 743 PRBool *yes);
733 744
734 SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, 745 SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd,
735 PRBool *last_handshake_resumed) ; 746 PRBool *last_handshake_resumed) ;
736 747
737 748
738 SEC_END_PROTOS 749 SEC_END_PROTOS
739 750
740 #endif /* __ssl_h_ */ 751 #endif /* __ssl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/secret_exporter.patch ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698