diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-12-03 17:25:26 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-12-03 17:25:26 +0000 |
| commit | 145e3a85931a836f8dccec73e02594f7255abcfd (patch) | |
| tree | 03b95bb4075b5bfadd5b0dabf3c4233035d6b774 /ssl | |
| parent | d7a2d00e5375699d95f3720a7b779ded3c805b5f (diff) | |
Notes
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_sess.c | 4 | ||||
| -rw-r--r-- | ssl/ssltest.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index e1695ab40601a..51c02dc9edd61 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -156,8 +156,8 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->ciphers = NULL; #ifndef OPENSSL_NO_TLSEXT dest->tlsext_hostname = NULL; -#endif dest->tlsext_tick = NULL; +#endif memset(&dest->ex_data, 0, sizeof(dest->ex_data)); /* We deliberately don't copy the prev and next pointers */ @@ -190,7 +190,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) goto err; } } -#endif if (ticket != 0) { dest->tlsext_tick = BUF_memdup(src->tlsext_tick, src->tlsext_ticklen); @@ -200,6 +199,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->tlsext_tick_lifetime_hint = 0; dest->tlsext_ticklen = 0; } +#endif return dest; err: diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 2f5a1343996de..7a758f0283a0f 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -116,6 +116,7 @@ /* Or gethostname won't be declared properly on Linux and GNU platforms. */ #define _BSD_SOURCE 1 +#define _DEFAULT_SOURCE 1 #include <assert.h> #include <errno.h> |