generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make no-psk compile without warnings.

Browse Source 
PR#4035

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-09-11 17:08:11 +01:00
parent c69ce93513
commit 9076bd25bf
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/s_server.c
View File

@ -1316,10 +1316,6 @@ int s_server_main(int argc, char *argv[])
goto end; goto end;
} }
break; break;
#else
case OPT_PSK_HINT:
case OPT_PSK:
break;
#endif #endif
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
case OPT_SRPVFILE: case OPT_SRPVFILE:

3
ssl/s3_lib.c
View File

@ -5228,8 +5228,9 @@ int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,
s->method->ssl3_enc->generate_master_secret(s, s->method->ssl3_enc->generate_master_secret(s,
s->session->master_key, s->session->master_key,
pms, pmslen); pms, pmslen);
#ifndef OPENSSL_NO_PSK
err: err:
#endif
if (pms) { if (pms) {
if (free_pms) if (free_pms)
OPENSSL_clear_free(pms, pmslen); OPENSSL_clear_free(pms, pmslen);

4
ssl/ssl_cert.c
View File

@ -333,13 +333,13 @@ CERT *ssl_cert_dup(CERT *cert)
goto err; goto err;
if (!custom_exts_copy(&ret->srv_ext, &cert->srv_ext)) if (!custom_exts_copy(&ret->srv_ext, &cert->srv_ext))
goto err; goto err;
#ifndef OPENSSL_NO_PSK
if (cert->psk_identity_hint) { if (cert->psk_identity_hint) {
ret->psk_identity_hint = BUF_strdup(cert->psk_identity_hint); ret->psk_identity_hint = BUF_strdup(cert->psk_identity_hint);
if (ret->psk_identity_hint == NULL) if (ret->psk_identity_hint == NULL)
goto err; goto err;
} }
#endif
return (ret); return (ret);
err: err: