Commit 9076bd25 authored Sep 11, 2015 by Dr. Stephen Henson

Make no-psk compile without warnings.



PR#4035

Reviewed-by: Matt Caswell <matt@openssl.org>

parent c69ce935

apps/s_server.c

+0 −4

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

ssl/s3_lib.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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->session->master_key,
		pms, pmslen);

		#ifndef OPENSSL_NO_PSK
		err:
		#endif
		if (pms) {
		if (free_pms)
		OPENSSL_clear_free(pms, pmslen);

ssl/ssl_cert.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -333,13 +333,13 @@ CERT ssl_cert_dup(CERT cert)
		goto err;
		if (!custom_exts_copy(&ret->srv_ext, &cert->srv_ext))
		goto err;

		#ifndef OPENSSL_NO_PSK
		if (cert->psk_identity_hint) {
		ret->psk_identity_hint = BUF_strdup(cert->psk_identity_hint);
		if (ret->psk_identity_hint == NULL)
		goto err;
		}

		#endif
		return (ret);

		err: