Commit d7e40670 authored by Niels Möller's avatar Niels Möller

Include nettle headers using <nettle/...> rather than "nettle/...".

parent aa7ce0e2
2013-04-19 Niels Mller <nisse@lysator.liu.se>
* All files: Include nettle headers using <nettle/...> rather than
"nettle/...", and include them before lsh headers.
2013-04-19 Magnus Holmgren <holmgren@debian.org>
* src/lsh.c (do_lsh_default_handler): Call exit for
......
......@@ -26,9 +26,9 @@
#ifndef LSH_ABSTRACT_CRYPTO_H_INCLUDED
#define LSH_ABSTRACT_CRYPTO_H_INCLUDED
#include "list.h"
#include <nettle/nettle-meta.h>
#include "nettle/nettle-meta.h"
#include "list.h"
/* Forward declaration, real declaration in nettle/sexp.h. */
struct sexp_iterator;
......
......@@ -38,7 +38,7 @@
#include <netinet/in.h>
#include "nettle/macros.h"
#include <nettle/macros.h>
#include "client.h"
......
......@@ -30,17 +30,17 @@
#include <assert.h>
#include <string.h>
#include "nettle/arcfour.h"
#include "nettle/aes.h"
#include "nettle/blowfish.h"
#include "nettle/cast128.h"
#include "nettle/des.h"
#include "nettle/serpent.h"
#include "nettle/twofish.h"
#include "nettle/cbc.h"
#include "nettle/ctr.h"
#include "nettle/hmac.h"
#include <nettle/arcfour.h>
#include <nettle/aes.h>
#include <nettle/blowfish.h>
#include <nettle/cast128.h>
#include <nettle/des.h>
#include <nettle/serpent.h>
#include <nettle/twofish.h>
#include <nettle/cbc.h>
#include <nettle/ctr.h>
#include <nettle/hmac.h>
#include "crypto.h"
......
......@@ -27,7 +27,7 @@
#include <assert.h>
#include "nettle/bignum.h"
#include <nettle/bignum.h>
#include "publickey_crypto.h"
......
......@@ -27,10 +27,10 @@
#include <assert.h>
#include "nettle/bignum.h"
#include "nettle/dsa.h"
#include "nettle/sexp.h"
#include "nettle/sha.h"
#include <nettle/bignum.h>
#include <nettle/dsa.h>
#include <nettle/sexp.h>
#include <nettle/sha.h>
#include "publickey_crypto.h"
......
......@@ -28,17 +28,17 @@
#include <stdlib.h>
#include "lsh.h"
#include <nettle/base64.h>
#include <nettle/bignum.h>
#include <nettle/buffer.h>
#include <nettle/cbc.h>
#include <nettle/ctr.h>
#include <nettle/hmac.h>
#include <nettle/memxor.h>
#include <nettle/nettle-meta.h>
#include <nettle/sexp.h>
#include "nettle/base64.h"
#include "nettle/bignum.h"
#include "nettle/buffer.h"
#include "nettle/cbc.h"
#include "nettle/ctr.h"
#include "nettle/hmac.h"
#include "nettle/memxor.h"
#include "nettle/nettle-meta.h"
#include "nettle/sexp.h"
#include "lsh.h"
/* Referenced by ssh_format.c */
unsigned
......
......@@ -28,7 +28,7 @@
#include <assert.h>
#include <string.h>
#include "nettle/bignum.h"
#include <nettle/bignum.h>
#include "format.h"
......
......@@ -28,7 +28,7 @@
#include <assert.h>
#include <string.h>
#include "nettle/macros.h"
#include <nettle/macros.h>
#include "gateway_commands.h"
......
......@@ -11,7 +11,7 @@
#include <fcntl.h>
#include <unistd.h>
#include "nettle/sexp.h"
#include <nettle/sexp.h>
#include "format.h"
#include "io.h"
......
......@@ -51,7 +51,7 @@
#include "werror.h"
#include "xalloc.h"
#include "nettle/sexp.h"
#include <nettle/sexp.h>
#include "lsh-decrypt-key.c.x"
......
......@@ -46,8 +46,8 @@ B2CTISEmV3KYx5NJpyKC3IBw/ckP6Q==
/* #include <string.h> */
#include <unistd.h>
#include "nettle/base64.h"
#include "nettle/sexp.h"
#include <nettle/base64.h>
#include <nettle/sexp.h>
#include "algorithms.h"
#include "alist.h"
......
......@@ -39,8 +39,8 @@
#include <unistd.h>
#endif
#include "nettle/dsa.h"
#include "nettle/rsa.h"
#include <nettle/dsa.h>
#include <nettle/rsa.h>
#include "crypto.h"
#include "environ.h"
......
......@@ -79,7 +79,7 @@
# endif
#endif /* WITH_ZLIB */
#include "nettle/yarrow.h"
#include <nettle/yarrow.h>
#include "environ.h"
#include "format.h"
......
......@@ -39,7 +39,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "nettle/sexp.h"
#include <nettle/sexp.h>
#include "algorithms.h"
#include "crypto.h"
......
......@@ -38,7 +38,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "nettle/sexp.h"
#include <nettle/sexp.h>
/* For struct spki_iterator */
#include "spki/parse.h"
......
......@@ -36,13 +36,13 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include "nettle/buffer.h"
#include "nettle/cbc.h"
#include "nettle/ctr.h"
#include "nettle/hmac.h"
#include "nettle/macros.h"
#include "nettle/memxor.h"
#include "nettle/sexp.h"
#include <nettle/buffer.h>
#include <nettle/cbc.h>
#include <nettle/ctr.h>
#include <nettle/hmac.h>
#include <nettle/macros.h>
#include <nettle/memxor.h>
#include <nettle/sexp.h>
#include "lsh_string.h"
......
......@@ -26,9 +26,9 @@
#include "lsh.h"
/* Can we avoid this dependency? */
#include "nettle/bignum.h"
#include "nettle/base64.h"
#include "nettle/nettle-meta.h"
#include <nettle/bignum.h>
#include <nettle/base64.h>
#include <nettle/nettle-meta.h>
/* The memory allocation model (for strings) is as follows:
*
......
......@@ -28,8 +28,8 @@
#include <assert.h>
#include <string.h>
#include "nettle/bignum.h"
#include "nettle/macros.h"
#include <nettle/bignum.h>
#include <nettle/macros.h>
#include "parse.h"
......
......@@ -26,8 +26,9 @@
#ifndef LSH_PARSE_H_INCLUDED
#define LSH_PARSE_H_INCLUDED
#include <nettle/bignum.h>
#include "atoms.h"
#include "nettle/bignum.h"
/* Simple buffer
* NOTE: All instances are allocated on the stack.
......
......@@ -30,7 +30,7 @@
#include <assert.h>
#include <string.h>
#include "nettle/memxor.h"
#include <nettle/memxor.h>
#include "crypto.h"
......
......@@ -28,7 +28,7 @@
#include <assert.h>
#include <string.h>
#include "nettle/macros.h"
#include <nettle/macros.h>
#include "read_packet.h"
......
......@@ -28,10 +28,10 @@
#include <assert.h>
#include <string.h>
#include "nettle/bignum.h"
#include "nettle/rsa.h"
#include "nettle/sexp.h"
#include "nettle/sha.h"
#include <nettle/bignum.h>
#include <nettle/rsa.h>
#include <nettle/sexp.h>
#include <nettle/sha.h>
#include "publickey_crypto.h"
......
......@@ -29,8 +29,8 @@
#include <assert.h>
#include "nettle/buffer.h"
#include "nettle/sexp.h"
#include <nettle/buffer.h>
#include <nettle/sexp.h>
#include "sexp.h"
......
......@@ -33,7 +33,8 @@
#include <stdlib.h>
#include <string.h>
#include "nettle/macros.h"
#include <nettle/macros.h>
#include "channel_forward.h"
#include "command.h"
#include "connection_commands.h"
......
......@@ -30,7 +30,7 @@
#include <assert.h>
#include <string.h>
#include "nettle/sexp.h"
#include <nettle/sexp.h>
#include "spki/parse.h"
#include "spki/tag.h"
......
......@@ -28,9 +28,9 @@
#include <stdlib.h>
#include <string.h>
#include "nettle/md5.h"
#include "nettle/sha.h"
#include "nettle/sexp.h"
#include <nettle/md5.h>
#include <nettle/sha.h>
#include <nettle/sexp.h>
#include "certificate.h"
#include "parse.h"
......
......@@ -24,10 +24,10 @@
#define LIBSPKI_CERTIFICATE_H_INCLUDED
#include "nettle/md5.h"
#include "nettle/sha.h"
#include "nettle/realloc.h"
#include "nettle/buffer.h"
#include <nettle/md5.h>
#include <nettle/sha.h>
#include <nettle/realloc.h>
#include <nettle/buffer.h>
/* This should be the only file ever including spki-types.h
* directly. */
......
......@@ -26,7 +26,7 @@
#include "parse.h"
#include "nettle/sexp.h"
#include <nettle/sexp.h>
enum spki_type
spki_transport_iterator_first(struct spki_iterator *i,
......
......@@ -27,7 +27,7 @@
#include <assert.h>
#include <string.h>
#include "nettle/sexp.h"
#include <nettle/sexp.h>
#include "parse.h"
#include "tag.h"
......
......@@ -23,7 +23,7 @@
#ifndef LIBSPKI_PARSE_H_INCLUDED
#define LIBSPKI_PARSE_H_INCLUDED
#include "nettle/sexp.h"
#include <nettle/sexp.h>
#include "certificate.h"
......
......@@ -30,8 +30,8 @@
#include <stdlib.h>
#include <string.h>
#include "nettle/buffer.h"
#include "nettle/sexp.h"
#include <nettle/buffer.h>
#include <nettle/sexp.h>
#include "tag.h"
......
......@@ -27,8 +27,8 @@
struct sexp_iterator;
#include "nettle/realloc.h"
#include "nettle/buffer.h"
#include <nettle/realloc.h>
#include <nettle/buffer.h>
struct spki_tag;
......
......@@ -6,7 +6,7 @@
#include "parse.h"
#include "tag.h"
#include "nettle/sexp.h"
#include <nettle/sexp.h>
#include <stdio.h>
#include <stdlib.h>
......
......@@ -24,9 +24,9 @@
# include "config.h"
#endif
#include "nettle/bignum.h"
#include "nettle/dsa.h"
#include "nettle/rsa.h"
#include <nettle/bignum.h>
#include <nettle/dsa.h>
#include <nettle/rsa.h>
#include "certificate.h"
#include "parse.h"
......
......@@ -29,9 +29,9 @@
#include <assert.h>
#include "nettle/bignum.h"
#include "nettle/macros.h"
#include "nettle/sexp.h"
#include <nettle/bignum.h>
#include <nettle/macros.h>
#include <nettle/sexp.h>
#include "srp.h"
......
......@@ -7,8 +7,8 @@
#include "werror.h"
#include "xalloc.h"
#include "nettle/knuth-lfib.h"
#include "nettle/sexp.h"
#include <nettle/knuth-lfib.h>
#include <nettle/sexp.h>
#include "spki/certificate.h"
#include "spki/parse.h"
......
......@@ -30,7 +30,7 @@
#include <sys/ioctl.h>
#include "nettle/macros.h"
#include <nettle/macros.h>
#include "tty.h"
......
......@@ -40,7 +40,7 @@
#include <sys/resource.h>
#include <sys/stat.h>
#include "nettle/yarrow.h"
#include <nettle/yarrow.h>
#include "randomness.h"
......
......@@ -25,7 +25,8 @@
#include <assert.h>
#include "nettle/macros.h"
#include <nettle/macros.h>
#include "connection.h"
#include "format.h"
#include "lsh_string.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment