root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix no-psk 

Fixes #2847

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2856)
This commit is contained in:
Matt Caswell 2017-03-06 09:51:54 +00:00
parent e6941c7814
commit 593a2aa3eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/s_server.c
View File

@ -144,12 +144,12 @@ static long socket_mtu;
#endif #endif
static int dtlslisten = 0; static int dtlslisten = 0;
static int early_data = 0;
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
static char *psk_identity = "Client_identity"; static char *psk_identity = "Client_identity";
char *psk_key = NULL; /* by default PSK is not used */ 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, static unsigned int psk_server_cb(SSL *ssl, const char *identity,
unsigned char *psk, unsigned char *psk,
unsigned int max_psk_len) unsigned int max_psk_len)