[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6974fca49d9d0b110c02c83a7bbe01907472ac5e (commit)
       via  8bd62abe00b893573920a7a12769fb00bd8da234 (commit)
      from  036ba500f7886ca2e7231549fa574ec2cdd45cef (commit)


- Log -----------------------------------------------------------------
commit 6974fca49d9d0b110c02c83a7bbe01907472ac5e
Author: Paul Hovey <paulh at us.megatrends.com>
Date:   Mon Dec 5 17:17:11 2016 -0500

    updated macro spacing for styling purposes
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    CLA: trivial

commit 8bd62abe00b893573920a7a12769fb00bd8da234
Author: Paul Hovey <paulh at us.megatrends.com>
Date:   Mon Dec 5 16:57:25 2016 -0500

    fix undoes errors introduced by https://github.com/openssl/openssl/commit/fc6076ca272f74eb1364c29e6974ad5da5ef9777?diff=split#diff-1014acebaa2c13d44ca196b9a433ef2eR184
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    CLA: trivial

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

Summary of changes:
 crypto/rand/randfile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index c96383a..15fa9dc 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -208,8 +208,8 @@ int RAND_write_file(const char *file)
              */
             return 1;
         }
-# endif
     }
+# endif
 #endif
 
 #if defined(O_CREAT) && !defined(OPENSSL_NO_POSIX_IO) && \