summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-06-28 17:18:27 +0100
committerMatt Caswell <matt@openssl.org>2017-06-29 10:15:50 +0100
commita599574be17579496877bcdcc5e1eeaf5b014cf3 (patch)
treea5d4cfaf17d9ffe1a1d8ab6d78efa2a64c6f47d1 /doc
parente88c40af4572a422be5fcab732bd46c55df136f8 (diff)
Updates following review of SSL_export_key_material() changes
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3782)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/SSL_export_keying_material.pod2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man3/SSL_export_keying_material.pod b/doc/man3/SSL_export_keying_material.pod
index f2fba4746b..532b1446d9 100644
--- a/doc/man3/SSL_export_keying_material.pod
+++ b/doc/man3/SSL_export_keying_material.pod
@@ -33,7 +33,7 @@ pointed to by B<context> and should be B<contextlen> bytes long. Provision of
a context is optional. If the context should be omitted entirely then
B<use_context> should be set to 0. Otherwise it should be any other value. If
B<use_context> is 0 then the values of B<context> and B<contextlen> are ignored.
-Note that in TLSv1.2 and below a zero length context is treated differently to
+Note that in TLSv1.2 and below a zero length context is treated differently from
no context at all, and will result in different keying material being returned.
In TLSv1.3 a zero length context is that same as no context at all and will
result in the same keying material being returned.