hcrypto: config/roken cleanup

All source files in lib/hcrypto should be built the same way.
Since this source directory is dependent on libroken then all source
files must be built using the roken.h declarations and included headers.

Also, there is no config.h in the local directory so angle brackets
include of quotes should be used.

Finally, because roken.h includes stdio.h, stdlib.h, stdarg.h, limits.h,
strings.h, sys/types.h, etc., do not include them separately.

Start all source files with

  #include <config.h>
  #include <roken.h>

Change-Id: I09ab47f8a5472018efe6c8b59a0e51fde8f24724

lib/hcrypto/aes.c

@@ -31,15 +31,13 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
-
+#include <roken.h>
 
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
 
-#include <string.h>
-
 #include "rijndael-alg-fst.h"
 #include "aes.h"
 

lib/hcrypto/bn.c

@@ -32,15 +32,9 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
 
 #include <krb5-types.h>
-#include <roken.h>
 #include <rfc2459_asn1.h> /* XXX */
 #include <der.h>
 

lib/hcrypto/camellia-ntt.c

@@ -30,16 +30,12 @@
  *  http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
-#include "config.h"
+#include <config.h>
-
+#include <roken.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include <krb5-types.h>
 #include "camellia-ntt.h"
 
-#include <roken.h>
-
 /* key constants */
 
 #define CAMELLIA_SIGMA1L (0xA09E667FL)

lib/hcrypto/camellia.c

@@ -31,19 +31,16 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
 
-#include <string.h>
-
 #include "camellia-ntt.h"
 #include "camellia.h"
 
-#include <roken.h>
-
 int
 CAMELLIA_set_key(const unsigned char *userkey,
 		 const int bits, CAMELLIA_KEY *key)

lib/hcrypto/common.c

@@ -34,11 +34,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <errno.h>
-
-#include <stdio.h>
-#include <stdlib.h>
 
 #include <krb5-types.h>
 #include <rfc2459_asn1.h>

lib/hcrypto/des.c

@@ -83,17 +83,12 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #define HC_DEPRECATED
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <krb5-types.h>
 #include <assert.h>
 
-#include <roken.h>
-
 #include "des.h"
 #include "ui.h"
 

lib/hcrypto/destest.c

@@ -31,15 +31,13 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/hcrypto/dh-ltm.c

@@ -34,13 +34,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dh.h>
-
 #include <roken.h>
 
+#include <dh.h>
+
 #include "tommath.h"
 
 static void

lib/hcrypto/dh-tfm.c

@@ -32,13 +32,10 @@
  */
 
 #include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dh.h>
-
 #include <roken.h>
 
+#include <dh.h>
+
 #ifdef USE_HCRYPTO_TFM
 
 #include "tfm.h"

lib/hcrypto/dh.c

@@ -34,16 +34,13 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <krb5-types.h>
 #include <rfc2459_asn1.h>
 
 #include <dh.h>
 
-#include <roken.h>
-
 /**
  * @page page_dh DH - Diffie-Hellman key exchange
  *

lib/hcrypto/dsa.c

@@ -32,13 +32,10 @@
  */
 
 #include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dsa.h>
-
 #include <roken.h>
 
+#include <dsa.h>
+
 /*
  *
  */

lib/hcrypto/ec.c

@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+#include <roken.h>
+
 #include "ec.h"
 
 struct EC_POINT {

lib/hcrypto/engine.c

@@ -32,10 +32,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <engine.h>
 

lib/hcrypto/evp-cc.c

@@ -37,12 +37,9 @@
 
 #ifdef __APPLE__
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H

lib/hcrypto/evp-crypt.c

@@ -34,13 +34,10 @@
 /* Windows crypto provider plugin, sample */
 
 #include <config.h>
+#include <roken.h>
 
 #define HC_DEPRECATED
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #include <evp.h>

lib/hcrypto/evp-hcrypto.c

@@ -32,13 +32,10 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #define HC_DEPRECATED
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #include <evp.h>

lib/hcrypto/evp-pkcs11.c

@@ -30,9 +30,8 @@
 
 /* PKCS#11 provider */
 
-#include "config.h"
+#include <config.h>
 #include <roken.h>
-
 #include <assert.h>
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>

lib/hcrypto/evp-w32.c

@@ -35,9 +35,9 @@
  * crypto APIs from Vista onwards).
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
-#include <windows.h>
 #include <assert.h>
 
 #include <evp.h>

lib/hcrypto/evp-wincng.c

@@ -30,9 +30,8 @@
 
 /* Windows CNG provider */
 
-#include "config.h"
+#include <config.h>
-
+#include <roken.h>
-#include <windows.h>
 #include <assert.h>
 
 #include <evp.h>

lib/hcrypto/evp.c

@@ -34,14 +34,11 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <roken.h>
 
 #define HC_DEPRECATED
 #define HC_DEPRECATED_CRYPTO
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #include <evp.h>
@@ -51,7 +48,6 @@
 #include <evp-pkcs11.h>
 
 #include <krb5-types.h>
-#include <roken.h>
 
 #ifndef HCRYPTO_DEF_PROVIDER
 # ifdef __APPLE__

lib/hcrypto/example_evp_cipher.c

@@ -31,17 +31,15 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+#include <roken.h>
+
 #include <krb5-types.h> /* should really be stdint.h */
 #include <hcrypto/evp.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <err.h>
 #include <assert.h>
 
-#include "roken.h"
-
 /* key and initial vector */
 static char key[16] =
     "\xaa\xbb\x45\xd4\xaa\xbb\x45\xd4"

lib/hcrypto/hmac.c

@@ -31,10 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include <config.h>
-#include <stdio.h>
+#include <roken.h>
-#include <stdlib.h>
+
-#include <string.h>
 #include <hmac.h>
 
 void

lib/hcrypto/md2.c

@@ -31,7 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #include "hash.h"
 #include "md2.h"

lib/hcrypto/md4.c

@@ -31,7 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #include "hash.h"
 #include "md4.h"

lib/hcrypto/md5.c

@@ -31,7 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #include "hash.h"
 #include "md5.h"

lib/hcrypto/md5crypt_test.c

@@ -32,9 +32,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <string.h>
 #include <des.h>
 
 struct test {

lib/hcrypto/mdtest.c

@@ -32,14 +32,10 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #define HC_DEPRECATED_CRYPTO
 
-#include <stdio.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <string.h>
 #ifdef KRB5
 #include <krb5-types.h>
 #endif

lib/hcrypto/passwd_dlg.c

@@ -37,9 +37,9 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #ifdef WIN32	/* Visual C++ 4.0 (Windows95/NT) */
-#include <Windows.h>
 #include "passwd_dlg.h"
 #include "Resource.h"
 #define passwdBufSZ 64

lib/hcrypto/pkcs12.c

@@ -32,16 +32,12 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <assert.h>
 
 #include <pkcs12.h>
 #include <bn.h>
 
-#include <roken.h>
-
 int
 PKCS12_key_gen(const void *key, size_t keylen,
 	       const void *salt, size_t saltlen,

lib/hcrypto/pkcs5.c

@@ -32,19 +32,15 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <evp.h>
 #include <hmac.h>
 
-#include <roken.h>
-
 /**
  * As descriped in PKCS5, convert a password, salt, and iteration counter into a crypto key.
  *

lib/hcrypto/rand-fortuna.c

@@ -30,16 +30,13 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <rand.h>
 #include <heim_threads.h>
 
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
-#include <roken.h>
 
 #include "randi.h"
 #include "aes.h"

lib/hcrypto/rand-timer.c

@@ -32,13 +32,10 @@
  */
 
 #include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <rand.h>
-
 #include <roken.h>
 
+#include <rand.h>
+
 #include "randi.h"
 
 #ifndef WIN32 /* don't bother with this on windows */

lib/hcrypto/rand-unix.c

@@ -32,14 +32,11 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <rand.h>
 #include <heim_threads.h>
 
-#include <roken.h>
-
 #include "randi.h"
 
 /*

lib/hcrypto/rand-w32.c

@@ -36,8 +36,6 @@
 
 #include <wincrypt.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <rand.h>
 #include <heim_threads.h>
 

lib/hcrypto/rand.c

@@ -34,14 +34,11 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <rand.h>
 #include <randi.h>
 
-#include <roken.h>
-
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif

lib/hcrypto/rc2.c

@@ -32,11 +32,9 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #include "rc2.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 /*
  * Implemented from Peter Gutmann's "Specification for Ron Rivests Cipher No.2"

lib/hcrypto/rc2test.c

@@ -32,11 +32,9 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #include <rc2.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 struct {
     const void *key;

lib/hcrypto/rc4.c

@@ -33,7 +33,8 @@
 
 /* implemented from description in draft-kaukonen-cipher-arcfour-03.txt */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #include <rc4.h>
 

lib/hcrypto/rctest.c

@@ -32,9 +32,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <string.h>
 #include <rc4.h>
 
 static unsigned char plain1[8] =

lib/hcrypto/rijndael-alg-fst.c

@@ -28,10 +28,9 @@
 
 /* "$NetBSD: rijndael-alg-fst.c,v 1.5 2001/11/13 01:40:10 lukem Exp $" */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
-
-#include <stdlib.h>
 #ifdef KRB5
 #include <krb5-types.h>
 #endif

lib/hcrypto/rnd_keys.c

@@ -31,15 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
-
+#include <roken.h>
 
 #define HC_DEPRECATED
 
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
-#include <stdlib.h>
 
 #include <des.h>
 #include <rand.h>

lib/hcrypto/rsa-gmp.c

@@ -32,16 +32,12 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <krb5-types.h>
 #include <assert.h>
 
 #include <rsa.h>
 
-#include <roken.h>
-
 #ifdef HAVE_GMP
 
 #include <gmp.h>

lib/hcrypto/rsa-ltm.c

@@ -32,16 +32,12 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <krb5-types.h>
 #include <assert.h>
 
 #include <rsa.h>
 
-#include <roken.h>
-
 #include "tommath.h"
 
 static int

lib/hcrypto/rsa-tfm.c

@@ -32,16 +32,12 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <krb5-types.h>
 #include <assert.h>
 
 #include <rsa.h>
 
-#include <roken.h>
-
 #ifdef USE_HCRYPTO_TFM
 
 #include "tfm.h"

lib/hcrypto/rsa.c

@@ -32,9 +32,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <krb5-types.h>
 #include <rfc2459_asn1.h>
 
@@ -44,8 +42,6 @@
 
 #include "common.h"
 
-#include <roken.h>
-
 /**
  * @page page_rsa RSA - public-key cryptography
  *

lib/hcrypto/sha.c

@@ -31,7 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #include "hash.h"
 #include "sha.h"

lib/hcrypto/sha256.c

@@ -31,7 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #include "hash.h"
 #include "sha.h"

lib/hcrypto/sha512.c

@@ -31,7 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
+#include <roken.h>
 
 #include "hash.h"
 #include "sha.h"

lib/hcrypto/test_bn.c

@@ -32,12 +32,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <bn.h>
 #include <rand.h>

lib/hcrypto/test_bulk.c

@@ -32,15 +32,9 @@
  */
 
 #include <config.h>
-
-#include <sys/types.h>
-#include <assert.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <getarg.h>
 #include <roken.h>
+#include <assert.h>
+#include <getarg.h>
 
 #include <evp.h>
 #include <evp-hcrypto.h>

lib/hcrypto/test_cipher.c

@@ -32,16 +32,11 @@
  */
 
 #include <config.h>
+#include <roken.h>
 
 #define HC_DEPRECATED_CRYPTO
 
-#include <sys/types.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <getarg.h>
-#include <roken.h>
 
 #include <evp.h>
 #include <evp-hcrypto.h>

lib/hcrypto/test_dh.c

@@ -38,11 +38,9 @@
  */
 
 #include <config.h>
-
-#include <stdio.h>
-#include <ctype.h>
-
 #include <roken.h>
+
+#include <ctype.h>
 #include <getarg.h>
 
 #include <dh.h>

lib/hcrypto/test_engine_dso.c

@@ -32,9 +32,6 @@
  */
 
 #include <config.h>
-
-#include <stdio.h>
-
 #include <roken.h>
 #include <getarg.h>
 

lib/hcrypto/test_hmac.c

@@ -32,16 +32,10 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <hmac.h>
 #include <evp.h>
-#include <roken.h>
 
 int
 main(int argc, char **argv)

lib/hcrypto/test_pkcs12.c

@@ -32,12 +32,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <pkcs12.h>
 #include <evp.h>

lib/hcrypto/test_pkcs5.c

@@ -32,12 +32,7 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <err.h>
 
 #include <evp.h>

lib/hcrypto/test_rand.c

@@ -34,12 +34,9 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <math.h>
 
-#include <roken.h>
 #include <getarg.h>
 
 #include "rand.h"

lib/hcrypto/test_rsa.c

@@ -32,9 +32,6 @@
  */
 
 #include <config.h>
-
-#include <stdio.h>
-
 #include <roken.h>
 #include <getarg.h>
 

lib/hcrypto/ui.c

@@ -32,15 +32,11 @@
  */
 
 #include <config.h>
-
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <signal.h>
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#include <roken.h>
 
 #include <ui.h>
 #ifdef HAVE_CONIO_H

lib/hcrypto/validate.c

@@ -32,12 +32,6 @@
  */
 
 #include <config.h>
-
-#include <sys/types.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <roken.h>
 
 #include <evp.h>