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

Unified Diff: net/third_party/nss/ssl/ssl.h

Issue 9663043: Add a boolean |had_context| argument to the TLS ExportKeyingMaterial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make suggested changes, add patch file Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/third_party/nss/ssl/ssl.h
===================================================================
--- net/third_party/nss/ssl/ssl.h (revision 126517)
+++ net/third_party/nss/ssl/ssl.h (working copy)
@@ -792,12 +792,14 @@
/* Export keying material according to RFC 5705.
** fd must correspond to a TLS 1.0 or higher socket and out must
-** already be allocated. If contextLen is zero it uses the no-context
-** construction from the RFC.
+** already be allocated. If hasContext is false, it uses the no-context
+** construction from the RFC and ignores the context and contextLen
+** arguments.
*/
SSL_IMPORT SECStatus SSL_ExportKeyingMaterial(PRFileDesc *fd,
const char *label,
unsigned int labelLen,
+ PRBool hasContext,
const unsigned char *context,
unsigned int contextLen,
unsigned char *out,

Powered by Google App Engine
This is Rietveld 408576698