Index: net/third_party/nss/ssl/ssl.h |
diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h |
index 1537aae543f921707e73fd4e99f78720ed90cc49..6adb403493c2e531c388bffc70d91fdc0cf92217 100644 |
--- a/net/third_party/nss/ssl/ssl.h |
+++ b/net/third_party/nss/ssl/ssl.h |
@@ -688,12 +688,14 @@ SSL_IMPORT SECItem *SSL_GetNegotiatedHostInfo(PRFileDesc *fd); |
/* Export keying material according to RFC 5705. |
** fd must correspond to a TLS 1.0 or higher socket and out must |
-** already be allocated. |
+** already be allocated. If contextLen is zero it uses the no-context |
+** construction from the RFC. |
*/ |
SSL_IMPORT SECStatus SSL_ExportKeyingMaterial(PRFileDesc *fd, |
const char *label, |
+ unsigned int labelLen, |
const unsigned char *context, |
- unsigned int contextlen, |
+ unsigned int contextLen, |
unsigned char *out, |
unsigned int outlen); |
wtc
2011/07/25 17:31:13
Please also rename this argument "outLen", with a
agl
2011/07/26 13:50:04
Done.
|