The branch OpenSSL_1_1_0-stable has been updated
via da16752b4a7f75cd1db50fd6f2ef96e27918fbcd (commit)
via e9c0fa9f5feb3b3687f34681d0f7618f496ce41f (commit)
from 5c75e43d84ca6a56adba5bab37b868576ff8b209 (commit)
- Log -----------------------------------------------------------------
commit da16752b4a7f75cd1db50fd6f2ef96e27918fbcd
Author: Paul Hovey <[email protected]>
Date: Mon Dec 5 17:17:11 2016 -0500
updated macro spacing for styling purposes
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
CLA: trivial
(cherry picked from commit 6974fca49d9d0b110c02c83a7bbe01907472ac5e)
commit e9c0fa9f5feb3b3687f34681d0f7618f496ce41f
Author: Paul Hovey <[email protected]>
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 <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
CLA: trivial
(cherry picked from commit 8bd62abe00b893573920a7a12769fb00bd8da234)
-----------------------------------------------------------------------
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) && \
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
