diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-21 13:55:02 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-21 16:19:41 +0100 |
| commit | 2f4a4df647d5d988eaa8be6a6c950b664f09b096 (patch) | |
| tree | 7521b0115f3b31a0a220cf363450d332df804fc3 /ssl | |
| parent | 21815512063d00325fd8e25f3f39ced047cb968b (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/3736)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f706c27982..3f49cfb617 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2292,15 +2292,15 @@ void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data, 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, + const unsigned char *context, size_t contextlen, int use_context) { if (s->version < TLS1_VERSION && s->version != DTLS1_BAD_VER) return -1; return s->method->ssl3_enc->export_keying_material(s, out, olen, label, - llen, p, plen, - use_context); + llen, context, + contextlen, use_context); } static unsigned long ssl_session_hash(const SSL_SESSION *a) |