[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  b5dc90121c74968cd789cba05829fbf3499f4b6d (commit)
      from  b0b723287761ae1b267d6935dc28eb83b6d31d22 (commit)


- Log -----------------------------------------------------------------
commit b5dc90121c74968cd789cba05829fbf3499f4b6d
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Mar 22 15:58:00 2015 +0000

    Fix no-ec with no-ec2m
    
    Fix builds config'd with no-ec and no-ec2m. Technically this combination is
    redundant - but the fix is straight forward. Fix from OpenWrt.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 ssl/t1_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index d85d26e..a59fe82 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -113,9 +113,11 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#ifndef OPENSSL_NO_EC
 #ifdef OPENSSL_NO_EC2M
 # include <openssl/ec.h>
 #endif
+#endif
 #include <openssl/ocsp.h>
 #include <openssl/rand.h>
 #include "ssl_locl.h"