[openssh-commits] [openssh] 03/03: XMSS-related files get includes.h

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Feb 26 12:18:28 AEDT 2018


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit f885474137df4b89498c0b8834c2ac72c47aa4bd
Author: Damien Miller <djm at mindrot.org>
Date:   Mon Feb 26 12:18:14 2018 +1100

    XMSS-related files get includes.h
---
 configure.ac        | 1 +
 ssh-xmss.c          | 2 ++
 sshkey-xmss.c       | 5 +++++
 xmss_commons.c      | 4 +++-
 xmss_fast.c         | 2 ++
 xmss_hash.c         | 2 ++
 xmss_hash_address.c | 2 ++
 xmss_wots.c         | 2 ++
 8 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d3deac83..a70d4062 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,6 +393,7 @@ AC_CHECK_HEADERS([ \
 	sys/bsdtty.h \
 	sys/cdefs.h \
 	sys/dir.h \
+	sys/file.h \
 	sys/mman.h \
 	sys/label.h \
 	sys/ndir.h \
diff --git a/ssh-xmss.c b/ssh-xmss.c
index d9dafd76..e25dbbf6 100644
--- a/ssh-xmss.c
+++ b/ssh-xmss.c
@@ -15,6 +15,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "includes.h"
+
 #define SSHKEY_INTERNAL
 #include <sys/types.h>
 #include <limits.h>
diff --git a/sshkey-xmss.c b/sshkey-xmss.c
index 41cc1bad..f146098b 100644
--- a/sshkey-xmss.c
+++ b/sshkey-xmss.c
@@ -23,6 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 
@@ -31,6 +33,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#ifdef HAVE_SYS_FILE_H
+# include <sys/file.h>
+#endif
 
 #include "ssh2.h"
 #include "ssherr.h"
diff --git a/xmss_commons.c b/xmss_commons.c
index 51171af9..0752f29b 100644
--- a/xmss_commons.c
+++ b/xmss_commons.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include "xmss_commons.h"
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,4 +26,4 @@ void hexdump(const unsigned char *a, size_t len)
   size_t i;
   for (i = 0; i < len; i++)
     printf("%02x", a[i]);
-}
\ No newline at end of file
+}
diff --git a/xmss_fast.c b/xmss_fast.c
index 7ddc92f8..6aff36a0 100644
--- a/xmss_fast.c
+++ b/xmss_fast.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include "xmss_fast.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/xmss_hash.c b/xmss_hash.c
index 963b584b..9c42c4f4 100644
--- a/xmss_hash.c
+++ b/xmss_hash.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include "xmss_hash_address.h"
 #include "xmss_commons.h"
 #include "xmss_hash.h"
diff --git a/xmss_hash_address.c b/xmss_hash_address.c
index 223c6f8a..385868de 100644
--- a/xmss_hash_address.c
+++ b/xmss_hash_address.c
@@ -4,6 +4,8 @@ Andreas Hülsing
 Joost Rijneveld
 Public domain.
 */
+#include "includes.h"
+
 #include <stdint.h>
 #include "xmss_hash_address.h"	/* prototypes */
 
diff --git a/xmss_wots.c b/xmss_wots.c
index fcd03340..4120acf1 100644
--- a/xmss_wots.c
+++ b/xmss_wots.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <limits.h>

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list