summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-06-21 13:55:02 +0100
committerMatt Caswell <matt@openssl.org>2017-06-21 16:18:36 +0100
commit23cec1f4b4801c643853bf2eb07d7eae5f4fe7cb (patch)
tree92bb9412d0ad323162277ada596fe2a76148470b /include
parentb5cdec2feac6049418543216ac5da70395697839 (diff)
Add documentation for the SSL_export_keying_material() function
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3735)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/tls1.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 156d3bf398..0878851569 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -212,12 +212,12 @@ __owur int SSL_get_servername_type(const SSL *s);
* as specified in RFC 5705. It writes |olen| bytes to |out| given a label and
* optional context. (Since a zero length context is allowed, the |use_context|
* flag controls whether a context is included.) It returns 1 on success and
- * zero otherwise.
+ * 0 or -1 otherwise.
*/
__owur int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
- const char *label, size_t llen,
- const unsigned char *p, size_t plen,
- int use_context);
+ const char *label, size_t llen,
+ const unsigned char *context,
+ size_t contextlen, int use_context);
int SSL_get_peer_signature_type_nid(const SSL *s, int *pnid);