[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  e2010b202a52be9120582537845f422a60d5d8c0 (commit)
      from  f617b4969a9261b9d7d381670aefbe2cf766a2cb (commit)


- Log -----------------------------------------------------------------
commit e2010b202a52be9120582537845f422a60d5d8c0
Author: Kurt Cancemi <kurt at x64architecture.com>
Date:   Thu Apr 9 09:54:38 2015 -0400

    The wrong ifdef is used to guard usage of PSK code
    
    PR#3790
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_asn1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index fb2a495..b6e7849 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