Header cleanup.

ok hshoexer@

15 files changed, 46 insertions, 39 deletions

diff --git a/lib/libkeynote/auxil.c b/lib/libkeynote/auxil.c
index 14a42ebc957..4511fef2376 100644
--- a/lib/libkeynote/auxil.c
+++ b/lib/libkeynote/auxil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auxil.c,v 1.8 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: auxil.c,v 1.9 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -23,11 +23,14 @@
 
 #include <ctype.h>
 #include <limits.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "header.h"
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
+
 #include "keynote.h"
 #include "assertion.h"
 #include "signature.h"
diff --git a/lib/libkeynote/base64.c b/lib/libkeynote/base64.c
index 414352809fe..070af30cf87 100644
--- a/lib/libkeynote/base64.c
+++ b/lib/libkeynote/base64.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: base64.c,v 1.10 2004/06/25 05:06:49 msf Exp $ */
-/* $OpenBSD: base64.c,v 1.10 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: base64.c,v 1.11 2004/06/29 11:35:56 msf Exp $ */
+/* $OpenBSD: base64.c,v 1.11 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -23,11 +23,11 @@
 #include <sys/types.h>
 
 #include <ctype.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "header.h"
 #include "keynote.h"
 
 int __b64_ntop(unsigned char const *, size_t, char *, size_t);
diff --git a/lib/libkeynote/environment.c b/lib/libkeynote/environment.c
index ba4e0f39daf..e766c8959e7 100644
--- a/lib/libkeynote/environment.c
+++ b/lib/libkeynote/environment.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: environment.c,v 1.18 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: environment.c,v 1.19 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -25,12 +25,12 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <memory.h>
+#include <regex.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 
diff --git a/lib/libkeynote/header.h b/lib/libkeynote/header.h
index dd7ca1ded8c..04dc1ad659f 100644
--- a/lib/libkeynote/header.h
+++ b/lib/libkeynote/header.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: header.h,v 1.9 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: header.h,v 1.10 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -44,18 +44,4 @@ int sessid;
 
 #define SIG_PRINT_OFFSET      12
 #define SIG_PRINT_LENGTH      50
-
-/* Includes */
-#include <sys/types.h>
-
-#include <regex.h>
-#include <openssl/crypto.h>
-#include <openssl/dsa.h>
-#include <openssl/rsa.h>
-#include <openssl/sha.h>
-#include <openssl/md5.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
 #endif /* _HEADER_H_ */
diff --git a/lib/libkeynote/keynote-keygen.c b/lib/libkeynote/keynote-keygen.c
index b759d91a1bd..1d343118772 100644
--- a/lib/libkeynote/keynote-keygen.c
+++ b/lib/libkeynote/keynote-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-keygen.c,v 1.20 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote-keygen.c,v 1.21 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -24,11 +24,17 @@
 
 #include <ctype.h>
 #include <fcntl.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <openssl/dsa.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+
 #include "header.h"
 #include "keynote.h"
 #include "assertion.h"
diff --git a/lib/libkeynote/keynote-sign.c b/lib/libkeynote/keynote-sign.c
index 8173cc2d44c..4edf131ad17 100644
--- a/lib/libkeynote/keynote-sign.c
+++ b/lib/libkeynote/keynote-sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-sign.c,v 1.15 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote-sign.c,v 1.16 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 
 #include <ctype.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libkeynote/keynote-sigver.c b/lib/libkeynote/keynote-sigver.c
index 31a735bd282..f5ac915b330 100644
--- a/lib/libkeynote/keynote-sigver.c
+++ b/lib/libkeynote/keynote-sigver.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-sigver.c,v 1.14 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote-sigver.c,v 1.15 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -24,6 +24,7 @@
 
 #include <ctype.h>
 #include <fcntl.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libkeynote/keynote-ver.l b/lib/libkeynote/keynote-ver.l
index 75d67c3a363..d352cc37441 100644
--- a/lib/libkeynote/keynote-ver.l
+++ b/lib/libkeynote/keynote-ver.l
@@ -1,5 +1,5 @@
 %{
-/* $OpenBSD: keynote-ver.l,v 1.13 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote-ver.l,v 1.14 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 
 #include <ctype.h>
+#include <regex.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/lib/libkeynote/keynote-ver.y b/lib/libkeynote/keynote-ver.y
index 0c88679a3f4..cd6b02f8346 100644
--- a/lib/libkeynote/keynote-ver.y
+++ b/lib/libkeynote/keynote-ver.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-ver.y,v 1.9 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote-ver.y,v 1.10 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -31,6 +31,7 @@
 
 #include <sys/types.h>
 
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libkeynote/keynote-verify.c b/lib/libkeynote/keynote-verify.c
index 0d35f22f679..609ddea73ca 100644
--- a/lib/libkeynote/keynote-verify.c
+++ b/lib/libkeynote/keynote-verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-verify.c,v 1.13 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote-verify.c,v 1.14 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -26,6 +26,7 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <memory.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libkeynote/keynote.l b/lib/libkeynote/keynote.l
index c2cefdba3b0..19964c59aec 100644
--- a/lib/libkeynote/keynote.l
+++ b/lib/libkeynote/keynote.l
@@ -1,5 +1,5 @@
 %{
-/* $OpenBSD: keynote.l,v 1.16 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote.l,v 1.17 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -24,12 +24,12 @@
 #include <sys/types.h>
 
 #include <ctype.h>
+#include <regex.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 
 #include "k.tab.h"
-#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 
diff --git a/lib/libkeynote/keynote.y b/lib/libkeynote/keynote.y
index 47a1372710c..c3d29bb15c5 100644
--- a/lib/libkeynote/keynote.y
+++ b/lib/libkeynote/keynote.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote.y,v 1.14 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: keynote.y,v 1.15 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -47,11 +47,11 @@
 
 #include <ctype.h>
 #include <math.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 
diff --git a/lib/libkeynote/parse_assertion.c b/lib/libkeynote/parse_assertion.c
index 857ba74645c..ad271146e05 100644
--- a/lib/libkeynote/parse_assertion.c
+++ b/lib/libkeynote/parse_assertion.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse_assertion.c,v 1.12 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: parse_assertion.c,v 1.13 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -23,11 +23,11 @@
 
 #include <ctype.h>
 #include <limits.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 #include "signature.h"
diff --git a/lib/libkeynote/sample-app.c b/lib/libkeynote/sample-app.c
index 3fcbcfb2c24..bfa5586716d 100644
--- a/lib/libkeynote/sample-app.c
+++ b/lib/libkeynote/sample-app.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sample-app.c,v 1.6 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: sample-app.c,v 1.7 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -22,10 +22,10 @@
 #include <sys/types.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <regex.h>
-#include "keynote.h"
+#include <keynote.h>
 
-#include "header.h"
 
 char policy_assertions[] = 
 "Authorizer: \"POLICY\"\n" \
diff --git a/lib/libkeynote/signature.c b/lib/libkeynote/signature.c
index 525874d20ed..7019b4ec37e 100644
--- a/lib/libkeynote/signature.c
+++ b/lib/libkeynote/signature.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signature.c,v 1.16 2004/06/25 05:06:49 msf Exp $ */
+/* $OpenBSD: signature.c,v 1.17 2004/06/29 11:35:56 msf Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -27,11 +27,18 @@
 #include <sys/types.h>
 
 #include <limits.h>
+#include <regex.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "header.h"
+#include <openssl/dsa.h>
+#include <openssl/md5.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
+#include <openssl/sha.h>
+#include <openssl/x509.h>
+
 #include "keynote.h"
 #include "assertion.h"
 #include "signature.h"