summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-02 17:43:41 +1000
committerDamien Miller <djm@mindrot.org>2014-07-02 17:43:41 +1000
commit82b2482ce68654815ee049b9bf021bb362a35ff2 (patch)
treedb87da9540d93e6e3deaac989c600c999177b004
parentdd8b1dd7933eb6f5652641b0cdced34a387f2e80 (diff)
- (djm) [sshkey.c] Conditionalise inclusion of util.h
-rw-r--r--ChangeLog1
-rw-r--r--sshkey.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 36109a9b..cc55a6aa 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 24023d03..c4a4b046 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"