Cleanup #include statements.

Change-Id: I45d1600e7606915ac1408abe956e6b85d26bd5c9

diff --git a/examples/digest.c b/examples/digest.c
index 9c68be3df99bfab0d29d86e3bc2958b1f906427b..76f0f1287330283704aab20503901d78423010f7 100644 (file)
--- a/examples/digest.c
+++ b/examples/digest.c
@@ -21,11 +21,11 @@
  * @brief
  */
 
-#include <stdio.h>
 #include <yaca/crypto.h>
 #include <yaca/digest.h>
 #include <yaca/simple.h>
 #include <yaca/error.h>
+
 #include "lorem.h"
 #include "misc.h"
 #include "../src/debug.h"

diff --git a/examples/encrypt.c b/examples/encrypt.c
index d436f52e29e9ceeaea3a0f2fc3f9a2081000e43c..ec2ee2ffbd36ec6479ab24fc822beff7a5cc96b4 100644 (file)
--- a/examples/encrypt.c
+++ b/examples/encrypt.c
@@ -28,6 +28,7 @@
 #include <yaca/encrypt.h>
 #include <yaca/key.h>
 #include <yaca/error.h>
+
 #include "lorem.h"
 #include "misc.h"
 #include "../src/debug.h"

diff --git a/examples/key_exchange.c b/examples/key_exchange.c
index 90c0cd316e88d5300b4e039c50f4f43417d19aeb..559059e3b4eca2a25746724b29441a5fc8db8ce3 100644 (file)
--- a/examples/key_exchange.c
+++ b/examples/key_exchange.c
@@ -22,11 +22,11 @@
  */
 
 #include <stdio.h>
+
 #include <yaca/crypto.h>
-#include <yaca/encrypt.h>
 #include <yaca/key.h>
-#include <yaca/types.h>
 #include <yaca/error.h>
+
 #include "misc.h"
 #include "../src/debug.h"
 

diff --git a/examples/key_import_export.c b/examples/key_import_export.c
index 183068c9e721dd6935a8c84b033141f45b8d56fd..9c44266c180fe68dd4523c1b2a0a11d6ce6d19f1 100644 (file)
--- a/examples/key_import_export.c
+++ b/examples/key_import_export.c
@@ -23,15 +23,13 @@
 
 #include <stdio.h>
 
-#include "misc.h"
-#include "../src/debug.h"
-
 #include <yaca/crypto.h>
-#include <yaca/encrypt.h>
 #include <yaca/key.h>
-#include <yaca/types.h>
 #include <yaca/error.h>
 
+#include "misc.h"
+#include "../src/debug.h"
+
 int key_import_export_sym(yaca_key_h sym)
 {
        int ret;

diff --git a/examples/misc.c b/examples/misc.c
index 2a96106c049d930b991a4f44a6c6f5ab3a402ac6..892da7240b912990b929a2581558365525b5c190 100644 (file)
--- a/examples/misc.c
+++ b/examples/misc.c
@@ -25,9 +25,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#include <openssl/bio.h>
+
 #include <yaca/crypto.h>
 
-#include <openssl/bio.h>
 #include "misc.h"
 
 void dump_hex(const char *buf, size_t dump_size, const char *fmt, ...)

diff --git a/examples/seal.c b/examples/seal.c
index 2f47074b655fb429f39d23c84a9ea3f14b30f4f4..0811f43a0c46239f9ceac9e6efdc20c17c66c68c 100644 (file)
--- a/examples/seal.c
+++ b/examples/seal.c
@@ -27,6 +27,7 @@
 #include <yaca/seal.h>
 #include <yaca/key.h>
 #include <yaca/error.h>
+
 #include "lorem.h"
 #include "misc.h"
 #include "../src/debug.h"

diff --git a/examples/sign.c b/examples/sign.c
index 86ca1e2af38e36b7b7a30dcba66fbad97bf195a8..fe56c5171134bc10e1f41824952fac65d8f41bbb 100644 (file)
--- a/examples/sign.c
+++ b/examples/sign.c
@@ -22,6 +22,7 @@
  */
 
 #include <stdio.h>
+
 #include <yaca/crypto.h>
 #include <yaca/sign.h>
 #include <yaca/key.h>

diff --git a/src/debug.c b/src/debug.c
index b5f55bb1b127ab78b92543ba6e5bf986b4c999ac..2cb0236b97edad0f943dd2387ea9698a8e41b9d8 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -21,13 +21,11 @@
  * @brief
  */
 
-#include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
 
 #include <openssl/err.h>
 
-#include <yaca/error.h>
 #include "internal.h"
 #include "debug.h"
 

diff --git a/src/digest.c b/src/digest.c
index 89eb1ff5a97f5665996513a5691390c75ab0881d..28b095e28bd569169142af91dc8dbfd557a222eb 100644 (file)
--- a/src/digest.c
+++ b/src/digest.c
@@ -22,14 +22,12 @@
  */
 
 #include <assert.h>
-#include <stdint.h>
 
 #include <openssl/evp.h>
-#include <openssl/err.h>
 
 #include <yaca/crypto.h>
+#include <yaca/digest.h>
 #include <yaca/error.h>
-#include <yaca/types.h>
 
 #include "internal.h"
 

diff --git a/src/encrypt.c b/src/encrypt.c
index b28c6be29ddff012c4c9015e1e0373982650eb76..f4749cd22c7638696b7b7a6c6ed3e110dae0affa 100644 (file)
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -22,11 +22,8 @@
  */
 
 #include <assert.h>
-#include <string.h>
 #include <stdint.h>
 
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
 #include <openssl/evp.h>
 
 #include <yaca/crypto.h>

diff --git a/src/internal.h b/src/internal.h
index 9a2a102ece6c9efe4d6b5e569803d53123bcf33a..c010335e468e1a9c40c6daba18df853fc288988c 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -25,6 +25,7 @@
 #define YACA_INTERNAL_H
 
 #include <stddef.h>
+
 #include <openssl/ossl_typ.h>
 #include <openssl/err.h>
 

diff --git a/src/key.c b/src/key.c
index e3d5ffc859f8fa8dcfc53f736ffb1bf369b169c1..f31f34bb68a7483b10a4cdf25ab3c916f086e24c 100755 (executable)
--- a/src/key.c
+++ b/src/key.c
@@ -24,23 +24,20 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <yaca/crypto.h>
-#include <yaca/error.h>
-#include <yaca/key.h>
-#include <yaca/types.h>
-
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/des.h>
 
-#include "internal.h"
+#include <yaca/crypto.h>
+#include <yaca/error.h>
+#include <yaca/key.h>
 
+#include "internal.h"
 
 int base64_decode_length(const char *data, size_t data_len, size_t *len)
 {

diff --git a/src/seal.c b/src/seal.c
index cbfe0cad5cac7f75a1c40879898398a094c38315..a3d3eb1d53a092acb5b976eff3fc427e1c782632 100644 (file)
--- a/src/seal.c
+++ b/src/seal.c
@@ -22,11 +22,8 @@
  */
 
 #include <assert.h>
-#include <string.h>
 #include <stdint.h>
 
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
 #include <openssl/evp.h>
 
 #include <yaca/crypto.h>

diff --git a/src/sign.c b/src/sign.c
index 72f59b1e6db8cfa5964cb20e3893125cabc80ef4..4f749e8d9016f866e0e07ea9aa9d811bb61da428 100644 (file)
--- a/src/sign.c
+++ b/src/sign.c
@@ -29,6 +29,7 @@
 #include <openssl/cmac.h>
 
 #include <yaca/crypto.h>
+#include <yaca/sign.h>
 #include <yaca/error.h>
 #include <yaca/key.h>
 

diff --git a/src/simple.c b/src/simple.c
index 3db1098a5a49858feb914627a31b2d77e66f1780..2597c0228917840dc3703a72ca6c88cfc220fe6b 100644 (file)
--- a/src/simple.c
+++ b/src/simple.c
@@ -22,12 +22,8 @@
  */
 
 #include <assert.h>
-#include <limits.h>
 #include <stdint.h>
 
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
-
 #include <yaca/crypto.h>
 #include <yaca/error.h>
 #include <yaca/encrypt.h>