[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5212d39bd92ede18b22fe8173e724a7eac35cb8a (commit)
      from  489eb74090a6327454f4a53213480eaa6659704b (commit)


- Log -----------------------------------------------------------------
commit 5212d39bd92ede18b22fe8173e724a7eac35cb8a
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Oct 22 23:45:45 2015 +0200

    Only include SRP headers when OPENSSL_NO_SRP is undefined
    
    [fixes github issue #447]
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/bn/bn_srp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index c575e6a..a1e438c 100644
--- a/crypto/bn/bn_srp.c
+++ b/crypto/bn/bn_srp.c
@@ -1,10 +1,11 @@
 #include "bn_lcl.h"
 #include "e_os.h"
-#include <openssl/srp.h>
-#include <internal/bn_srp.h>
 
 #ifndef OPENSSL_NO_SRP
 
+#include <openssl/srp.h>
+#include <internal/bn_srp.h>
+
 # if (BN_BYTES == 8)
 #  if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
 #   define bn_pack4(a1,a2,a3,a4) ((a1##UI64<<48)|(a2##UI64<<32)|(a3##UI64<<16)|a4##UI64)