- (djm) [sshkey.c] Conditionalise inclusion of util.h
diff --git a/ChangeLog b/ChangeLog
index 36109a9..cc55a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -175,6 +175,7 @@
[regress/unittests/sshkey/testdata/rsa_n]
[regress/unittests/sshkey/testdata/rsa_n_pw]
unit and fuzz tests for new key API
+ - (djm) [sshkey.c] Conditionalise inclusion of util.h
20140618
- (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare
diff --git a/sshkey.c b/sshkey.c
index 24023d0..c4a4b04 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -39,7 +39,9 @@
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_UTIL_H
#include <util.h>
+#endif /* HAVE_UTIL_H */
#include "ssh2.h"
#include "ssherr.h"