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, |