diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-11 17:08:11 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-10-11 13:38:01 +0100 |
| commit | 9076bd25bfad9c661cad928331295bd5ec9b5af3 (patch) | |
| tree | 2ebe76122bd1d2da2916ce8eae75915f1317ed43 /ssl | |
| parent | c69ce9351336f5b4a8b33890756b3fd185528210 (diff) | |
Make no-psk compile without warnings.
PR#4035
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_cert.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 4b11e60abd..5e7b618e49 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -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); diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 7571095932..1caa3c85e3 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -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: |