The branch master has been updated
via 3c49b2e0cdb1c82f424ba172ca819360fa6ccfe2 (commit)
via 33e49fda9635f3daabf912a8781abde0de681fe6 (commit)
from 9515accaf973ad314e03bdc048b13ec3509cb2e9 (commit)
- Log -----------------------------------------------------------------
commit 3c49b2e0cdb1c82f424ba172ca819360fa6ccfe2
Author: Matt Caswell <[email protected]>
Date: Mon Jul 18 10:29:46 2016 +0100
Fix mingw build
Mingw builds on Travis were failing because INT_MAX was undeclared.
Reviewed-by: Rich Salz <[email protected]>
commit 33e49fda9635f3daabf912a8781abde0de681fe6
Author: Matt Caswell <[email protected]>
Date: Mon Jul 18 10:28:45 2016 +0100
Fix strict-warnings build
The i2d_SCT_LIST function is declared as __owur, therefore we need to check
the result or a --strict-warnings build will fail.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
crypto/LPdir_win.c | 1 +
fuzz/ct.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index db3dfce..8f674d3 100644
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -35,6 +35,7 @@
#include <windows.h>
#include <tchar.h>
+#include "internal/numbers.h"
#ifndef LPDIR_H
# include "LPdir.h"
#endif
diff --git a/fuzz/ct.c b/fuzz/ct.c
index 0abcd8a..411ccef 100644
--- a/fuzz/ct.c
+++ b/fuzz/ct.c
@@ -29,7 +29,9 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
SCT_LIST_print(scts, bio, 4, "\n", NULL);
BIO_free(bio);
- i2d_SCT_LIST(scts, &der);
+ if (i2d_SCT_LIST(scts, &der)) {
+ /* Silence unused result warning */
+ }
OPENSSL_free(der);
SCT_LIST_free(scts);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
