diff options
| author | jkim <jkim@FreeBSD.org> | 2016-09-22 15:05:38 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-09-22 15:05:38 +0000 |
| commit | 4e88981ba96e1935778ecbba00e5789c2fa7e1f0 (patch) | |
| tree | 68e00d9c0f53061c7dfc9dff0f6047187d183bce /crypto/openssl/ssl/ssl_lib.c | |
| parent | 454e7daab0b343b888c1efdf32cb029f6b2cf3d2 (diff) | |
| download | FreeBSD-src-4e88981ba96e1935778ecbba00e5789c2fa7e1f0.zip FreeBSD-src-4e88981ba96e1935778ecbba00e5789c2fa7e1f0.tar.gz | |
Merge OpenSSL 1.0.1u.
Diffstat (limited to 'crypto/openssl/ssl/ssl_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c index 33c52ac..83ef233 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/openssl/ssl/ssl_lib.c @@ -1662,7 +1662,7 @@ int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, const unsigned char *p, size_t plen, int use_context) { - if (s->version < TLS1_VERSION) + if (s->version < TLS1_VERSION && s->version != DTLS1_BAD_VER) return -1; return s->method->ssl3_enc->export_keying_material(s, out, olen, label, @@ -1833,7 +1833,7 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth) ret->tlsext_servername_callback = 0; ret->tlsext_servername_arg = NULL; /* Setup RFC4507 ticket keys */ - if ((RAND_pseudo_bytes(ret->tlsext_tick_key_name, 16) <= 0) + if ((RAND_bytes(ret->tlsext_tick_key_name, 16) <= 0) || (RAND_bytes(ret->tlsext_tick_hmac_key, 16) <= 0) || (RAND_bytes(ret->tlsext_tick_aes_key, 16) <= 0)) ret->options |= SSL_OP_NO_TICKET; |
