summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--sshkey.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 36109a9be..cc55a6aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -175,6 +175,7 @@
175 [regress/unittests/sshkey/testdata/rsa_n] 175 [regress/unittests/sshkey/testdata/rsa_n]
176 [regress/unittests/sshkey/testdata/rsa_n_pw] 176 [regress/unittests/sshkey/testdata/rsa_n_pw]
177 unit and fuzz tests for new key API 177 unit and fuzz tests for new key API
178 - (djm) [sshkey.c] Conditionalise inclusion of util.h
178 179
17920140618 18020140618
180 - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare 181 - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare
diff --git a/sshkey.c b/sshkey.c
index 24023d036..c4a4b0461 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -39,7 +39,9 @@
39#include <errno.h> 39#include <errno.h>
40#include <stdio.h> 40#include <stdio.h>
41#include <string.h> 41#include <string.h>
42#ifdef HAVE_UTIL_H
42#include <util.h> 43#include <util.h>
44#endif /* HAVE_UTIL_H */
43 45
44#include "ssh2.h" 46#include "ssh2.h"
45#include "ssherr.h" 47#include "ssherr.h"