diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2018-01-21 11:30:36 +0900 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-02-02 23:54:14 +0000 |
| commit | 1f5878b8e25a785dde330bf485e6ed5a6ae09a1a (patch) | |
| tree | 57b6050a9997ebedb1cea76b4bfb1de9b5997923 /ssl/tls13_enc.c | |
| parent | b1a51abb935163cbb0b0089ad9ee8ff174341bbd (diff) | |
Make sure that exporting keying material is allowed
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4944)
Diffstat (limited to 'ssl/tls13_enc.c')
| -rw-r--r-- | ssl/tls13_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index f555df54fc..05355fb714 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -666,7 +666,7 @@ int tls13_export_keying_material(SSL *s, unsigned char *out, size_t olen, unsigned int hashsize, datalen; int ret = 0; - if (ctx == NULL) + if (ctx == NULL || !ossl_statem_export_allowed(s)) goto err; if (!use_context) |