diff options
| author | Matt Caswell <matt@openssl.org> | 2017-03-06 09:51:54 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-06 09:52:21 +0000 |
| commit | 593a2aa3eb8e0153ff0b6af72b1af3327b46a19e (patch) | |
| tree | 43d57154c4aebd0cd9278faa83c4f98ec15c3b92 /apps | |
| parent | e6941c7814bb25729d65e1f8e87d1c110a0cbe7e (diff) | |
| download | openssl-593a2aa3eb8e0153ff0b6af72b1af3327b46a19e.tar.gz | |
Fix no-psk
Fixes #2847
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2856)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 57bae82990..a6048fb831 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -144,12 +144,12 @@ static long socket_mtu; #endif static int dtlslisten = 0; +static int early_data = 0; + #ifndef OPENSSL_NO_PSK static char *psk_identity = "Client_identity"; char *psk_key = NULL; /* by default PSK is not used */ -static int early_data = 0; - static unsigned int psk_server_cb(SSL *ssl, const char *identity, unsigned char *psk, unsigned int max_psk_len) |