summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r--src/lib/libssl/ssl_lib.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index d3108f2663..3fa8f5039f 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.86 2014/10/15 17:39:34 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.87 2014/10/18 16:13:16 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -145,7 +145,6 @@
145#include <openssl/objects.h> 145#include <openssl/objects.h>
146#include <openssl/lhash.h> 146#include <openssl/lhash.h>
147#include <openssl/x509v3.h> 147#include <openssl/x509v3.h>
148#include <openssl/rand.h>
149#include <openssl/ocsp.h> 148#include <openssl/ocsp.h>
150#include <openssl/dh.h> 149#include <openssl/dh.h>
151#ifndef OPENSSL_NO_ENGINE 150#ifndef OPENSSL_NO_ENGINE
@@ -1786,11 +1785,11 @@ SSL_CTX_new(const SSL_METHOD *meth)
1786 1785
1787 ret->tlsext_servername_callback = 0; 1786 ret->tlsext_servername_callback = 0;
1788 ret->tlsext_servername_arg = NULL; 1787 ret->tlsext_servername_arg = NULL;
1788
1789 /* Setup RFC4507 ticket keys */ 1789 /* Setup RFC4507 ticket keys */
1790 if ((RAND_pseudo_bytes(ret->tlsext_tick_key_name, 16) <= 0) 1790 arc4random_buf(ret->tlsext_tick_key_name, 16);
1791 || (RAND_bytes(ret->tlsext_tick_hmac_key, 16) <= 0) 1791 arc4random_buf(ret->tlsext_tick_hmac_key, 16);
1792 || (RAND_bytes(ret->tlsext_tick_aes_key, 16) <= 0)) 1792 arc4random_buf(ret->tlsext_tick_aes_key, 16);
1793 ret->options |= SSL_OP_NO_TICKET;
1794 1793
1795 ret->tlsext_status_cb = 0; 1794 ret->tlsext_status_cb = 0;
1796 ret->tlsext_status_arg = NULL; 1795 ret->tlsext_status_arg = NULL;