From: Kurt Cancemi <kurt@x64architecture.com>
Date: Thu, 9 Apr 2015 13:54:38 +0000 (-0400)
Subject: The wrong ifdef is used to guard usage of PSK code
X-Git-Tag: OpenSSL_1_1_0-pre1~1327
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=e2010b202a52be9120582537845f422a60d5d8c0

The wrong ifdef is used to guard usage of PSK code

PR#3790

Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index fb2a49556d..b6e784924d 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -109,7 +109,7 @@ typedef struct {
     long tlsext_tick_lifetime_hint;
     ASN1_OCTET_STRING *tlsext_tick;
 #endif
-#ifndef OPENSSL_NO_TLSEXT
+#ifndef OPENSSL_NO_PSK
     ASN1_OCTET_STRING *psk_identity_hint;
     ASN1_OCTET_STRING *psk_identity;
 #endif