sync

21 files changed, 224 insertions, 168 deletions

diff --git a/lib/libkeynote/Makefile.in b/lib/libkeynote/Makefile.in
index 0a28496491e..14f97cbfce3 100644
--- a/lib/libkeynote/Makefile.in
+++ b/lib/libkeynote/Makefile.in
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.in,v 1.6 1999/10/11 00:09:33 angelos Exp $
+# $OpenBSD: Makefile.in,v 1.7 1999/10/26 22:31:37 angelos Exp $
 #
 # The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 #
@@ -18,9 +18,9 @@
 # MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 # PURPOSE.
 
-VERSION = 2.1
+VERSION = 2.2
 DISTFILE = keynote-${VERSION}.tar.gz
-KNSUBDIR = KeyNote-${VERSION}
+KNSUBDIR = keynote-${VERSION}
 
 LEX = @LEX@
 CC = @CC@
@@ -53,7 +53,7 @@ SSLKEY = testsuite/test.key.pem
 SIGN_ASSERT = testsuite/test-assertion1-signed
 
 # No-crypto compile/link flags and definitions
-NOCRYPTODEFS = @DEFS@
+NOCRYPTODEFS = @DEFS@ @CPPFLAGS@
 
 # Final compile/link flags and definitions
 DEFS = -DCRYPTO ${NOCRYPTODEFS}
@@ -122,6 +122,7 @@ cleanall: clean
 	$(RM) $(RMFLAGS) lex.kv.c y.output z.output ${DISTFILE}
 	$(RM) $(RMFLAGS) $(TARGET) $(TARGET2) man/*.0 config.cache
 	$(RM) $(RMFLAGS) config.log config.status config.h Makefile
+	$(RM) $(RMFLAGS) man/*.cat?
 
 $(SSLCERT) $(SSLKEY):
 	$(SSLEAY) req -config $(SSLCONF) \
@@ -150,19 +151,19 @@ test: all
 		-l testsuite/test-assertion6 \
 		-l testsuite/test-assertion7 || ${TRUE}
 
-manpages: mankeynote mansystem manutility mansyntax
+manpages: mansyntax mankeynote mansystem manutility mansyntax
+
+mansyntax:
+	${NROFF} ${NROFFFLAGS} man/keynote.5 > man/keynote.cat5
 
 mankeynote:
-	${NROFF} ${NROFFFLAGS} man/keynote.3 > man/keynote-library.0
+	${NROFF} ${NROFFFLAGS} man/keynote.3 > man/keynote.cat3
 
 mansystem:
-	${NROFF} ${NROFFFLAGS} man/keynote.4 > man/keynote-system.0
+	${NROFF} ${NROFFFLAGS} man/keynote.4 > man/keynote.cat4
 
 manutility:
-	${NROFF} ${NROFFFLAGS} man/keynote.1 > man/keynote-utility.0
-
-mansyntax:
-	${NROFF} ${NROFFFLAGS} man/keynote.5 > man/keynote-syntax.0
+	${NROFF} ${NROFFFLAGS} man/keynote.1 > man/keynote.cat1
 
 distribution: test cleanall manpages
 	${MKDIR} ${KNSUBDIR}
@@ -172,4 +173,4 @@ distribution: test cleanall manpages
 			  ${KNSUBDIR}/.cvsignore ${KNSUBDIR}/man/CVS \
 			  ${KNSUBDIR}/man/.cvsignore ${KNSUBDIR}/doc/CVS
 	$(TAR) $(TARFLAGS) ${KNSUBDIR}
-	${RM} ${RMFLAGS2} ${KNSUBDIR} man/*.0
+	${RM} ${RMFLAGS2} ${KNSUBDIR} man/*.0 man/*.cat?
diff --git a/lib/libkeynote/README b/lib/libkeynote/README
index 742122291b1..605599904d4 100644
--- a/lib/libkeynote/README
+++ b/lib/libkeynote/README
@@ -1,6 +1,6 @@
-# $OpenBSD: README,v 1.5 1999/10/11 00:09:33 angelos Exp $
+# $OpenBSD: README,v 1.6 1999/10/26 22:31:37 angelos Exp $
 
-This is release 2.0 of the KeyNote trust management library reference
+This is release 2.1 of the KeyNote trust management library reference
 implementation (in case you are wondering, there was never an official 1.0
 release).
 
@@ -21,7 +21,7 @@ Compile tips:
 	   ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/
 
   OpenSSL can be found at:
-	   http://www.openssl.com/
+	   http://www.openssl.org/
 
 The Makefile creates the libkeynote.a library and the keynote program.
 *** Notice that the 4 programs of previous releases have been folded into one
@@ -41,7 +41,7 @@ To view them, use:
 Alternatively, you can just install them in your manpath. If your
 nroff does not support the -mandoc flag, use -man instead. For those
 systems that do not have nroff, the text version of the man pages are
-provided as well (the files with .0 suffixes in the same directory).
+provided as well (the files with .cat? suffixes in the same directory).
 
 The "keynote verify" function can be used to verify a request, given a
 set of assertions and an environment file. The directory testsuite/
diff --git a/lib/libkeynote/TODO b/lib/libkeynote/TODO
index 803fe44395f..888b02f3eaa 100644
--- a/lib/libkeynote/TODO
+++ b/lib/libkeynote/TODO
@@ -1,7 +1,8 @@
-# $OpenBSD: TODO,v 1.5 1999/10/01 01:08:29 angelos Exp $
+# $OpenBSD: TODO,v 1.6 1999/10/26 22:31:37 angelos Exp $
 
 TODOs:
 	- Write key/signature algorithm drafts
+	- Sample application
 	- More interesting/comprehensive testsuite
 	- Make X509 support be non-RSA specific
 	- Recursive parser
diff --git a/lib/libkeynote/aux.c b/lib/libkeynote/aux.c
index 46e88773ca0..24ef66d5bff 100644
--- a/lib/libkeynote/aux.c
+++ b/lib/libkeynote/aux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aux.c,v 1.6 1999/10/09 19:47:31 angelos Exp $ */
+/* $OpenBSD: aux.c,v 1.7 1999/10/26 22:31:37 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -36,6 +36,7 @@
 #include <limits.h>
 #endif /* HAVE_LIMITS_H */
 
+#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 #include "signature.h"
diff --git a/lib/libkeynote/base64.c b/lib/libkeynote/base64.c
index c5130f379da..54cd3e6447b 100644
--- a/lib/libkeynote/base64.c
+++ b/lib/libkeynote/base64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: base64.c,v 1.5 1999/10/09 19:47:31 angelos Exp $ */
+/* $OpenBSD: base64.c,v 1.6 1999/10/26 22:31:37 angelos Exp $ */
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
  *
@@ -57,6 +57,7 @@
 #endif /* !HAVE_STRCHR */
 #endif /* STDC_HEADERS */
 
+#include "header.h"
 #include "keynote.h"
 
 #if defined(HAVE___B64_NTOP)
diff --git a/lib/libkeynote/config.hin b/lib/libkeynote/config.hin
index 37472739f3b..e36925bc493 100644
--- a/lib/libkeynote/config.hin
+++ b/lib/libkeynote/config.hin
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.hin,v 1.1 1999/10/01 01:08:29 angelos Exp $ */
+/* $OpenBSD: config.hin,v 1.2 1999/10/26 22:31:37 angelos Exp $ */
 
 /* config.hin.  Generated automatically from configure.in by autoheader.  */
 
@@ -26,6 +26,9 @@
 /* Define if you have the close function.  */
 #undef HAVE_CLOSE
 
+/* Define if you have the <crypto.h> header file.  */
+#undef HAVE_CRYPTO_H
+
 /* Define if you have the getopt function.  */
 #undef HAVE_GETOPT
 
diff --git a/lib/libkeynote/configure b/lib/libkeynote/configure
index 77bbf748624..81b2b00b93e 100644
--- a/lib/libkeynote/configure
+++ b/lib/libkeynote/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $OpenBSD: configure,v 1.1 1999/10/01 01:08:29 angelos Exp $
+# $OpenBSD: configure,v 1.2 1999/10/26 22:31:38 angelos Exp $
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -1257,8 +1257,11 @@ else
 fi
 
 
+LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\
+ -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib"
+
 echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
-echo "configure:1261: checking for floor in -lm" >&5
+echo "configure:1264: checking for floor in -lm" >&5
 ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1266,7 +1269,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1269 "configure"
+#line 1272 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1277,7 +1280,7 @@ int main() {
 floor()
 ; return 0; }
 EOF
-if { (eval echo configure:1280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1292,39 +1295,32 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lm $LIBS"
-
+  LIBS="$LIBS -lm"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for RSA_ref_private_decrypt in -lRSAglue""... $ac_c" 1>&6
-echo "configure:1308: checking for RSA_ref_private_decrypt in -lRSAglue" >&5
-ac_lib_var=`echo RSAglue'_'RSA_ref_private_decrypt | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for RSAPrivateDecrypt in -lrsaref""... $ac_c" 1>&6
+echo "configure:1304: checking for RSAPrivateDecrypt in -lrsaref" >&5
+ac_lib_var=`echo rsaref'_'RSAPrivateDecrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lRSAglue  $LIBS"
+LIBS="-lrsaref  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1316 "configure"
+#line 1312 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char RSA_ref_private_decrypt();
+char RSAPrivateDecrypt();
 
 int main() {
-RSA_ref_private_decrypt()
+RSAPrivateDecrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:1327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1339,39 +1335,32 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo RSAglue | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lRSAglue $LIBS"
-
+  LIBS="$LIBS -lrsaref"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for RSAPrivateDecrypt in -lrsaref""... $ac_c" 1>&6
-echo "configure:1355: checking for RSAPrivateDecrypt in -lrsaref" >&5
-ac_lib_var=`echo rsaref'_'RSAPrivateDecrypt | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for i2a_ASN1_STRING in -lcrypto""... $ac_c" 1>&6
+echo "configure:1344: checking for i2a_ASN1_STRING in -lcrypto" >&5
+ac_lib_var=`echo crypto'_'i2a_ASN1_STRING | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lrsaref  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1363 "configure"
+#line 1352 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char RSAPrivateDecrypt();
+char i2a_ASN1_STRING();
 
 int main() {
-RSAPrivateDecrypt()
+i2a_ASN1_STRING()
 ; return 0; }
 EOF
-if { (eval echo configure:1374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1386,39 +1375,32 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo rsaref | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lrsaref $LIBS"
-
+  LIBS="$LIBS -lcrypto"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for i2a_ASN1_STRING in -lcrypto""... $ac_c" 1>&6
-echo "configure:1402: checking for i2a_ASN1_STRING in -lcrypto" >&5
-ac_lib_var=`echo crypto'_'i2a_ASN1_STRING | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for RSA_ref_private_encrypt in -lRSAglue""... $ac_c" 1>&6
+echo "configure:1384: checking for RSA_ref_private_encrypt in -lRSAglue" >&5
+ac_lib_var=`echo RSAglue'_'RSA_ref_private_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lcrypto  $LIBS"
+LIBS="-lRSAglue  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1410 "configure"
+#line 1392 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char i2a_ASN1_STRING();
+char RSA_ref_private_encrypt();
 
 int main() {
-i2a_ASN1_STRING()
+RSA_ref_private_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1433,21 +1415,18 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lcrypto $LIBS"
-
+  LIBS="$LIBS -lRSAglue"
 else
   echo "$ac_t""no" 1>&6
 fi
 
 
+CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\
+ -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\
+ -I/usr/local/openssl/include -I/pkg/include"
+
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1450: checking how to run the C preprocessor" >&5
+echo "configure:1429: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1462,13 +1441,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1465 "configure"
+#line 1444 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1479,13 +1458,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1482 "configure"
+#line 1461 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1496,13 +1475,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1499 "configure"
+#line 1478 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1527,12 +1506,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1530: checking for ANSI C header files" >&5
+echo "configure:1509: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1535 "configure"
+#line 1514 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1540,7 +1519,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1557,7 +1536,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1560 "configure"
+#line 1539 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1575,7 +1554,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1578 "configure"
+#line 1557 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1596,7 +1575,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1599 "configure"
+#line 1578 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1607,7 +1586,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1631,12 +1610,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1634: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1613: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1639 "configure"
+#line 1618 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1645,7 +1624,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1669,17 +1648,17 @@ for ac_hdr in fcntl.h limits.h unistd.h regex.h sys/time.h io.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1672: checking for $ac_hdr" >&5
+echo "configure:1651: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1677 "configure"
+#line 1656 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1705,21 +1684,21 @@ else
 fi
 done
 
-for ac_hdr in ssl/crypto.h openssl/crypto.h memory.h
+for ac_hdr in ssl/crypto.h openssl/crypto.h crypto.h memory.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1712: checking for $ac_hdr" >&5
+echo "configure:1691: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1717 "configure"
+#line 1696 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1751,7 +1730,7 @@ do
 
 ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_file""... $ac_c" 1>&6
-echo "configure:1754: checking for $ac_file" >&5
+echo "configure:1733: checking for $ac_file" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1780,12 +1759,12 @@ done
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1783: checking for working const" >&5
+echo "configure:1762: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1788 "configure"
+#line 1767 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1834,7 +1813,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1855,12 +1834,12 @@ EOF
 fi
 
 echo $ac_n "checking for u_int""... $ac_c" 1>&6
-echo "configure:1858: checking for u_int" >&5
+echo "configure:1837: checking for u_int" >&5
 if eval "test \"`echo '$''{'ac_cv_type_u_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1863 "configure"
+#line 1842 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1888,12 +1867,12 @@ EOF
 fi
 
 echo $ac_n "checking for u_char""... $ac_c" 1>&6
-echo "configure:1891: checking for u_char" >&5
+echo "configure:1870: checking for u_char" >&5
 if eval "test \"`echo '$''{'ac_cv_type_u_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1896 "configure"
+#line 1875 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1924,12 +1903,12 @@ fi
 for ac_func in regcomp open close read _open _close _read strchr memcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1927: checking for $ac_func" >&5
+echo "configure:1906: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1932 "configure"
+#line 1911 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1952,7 +1931,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1979,12 +1958,12 @@ done
 for ac_func in strcasecmp strncasecmp stricmp strnicmp snprintf __b64_ntop
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1982: checking for $ac_func" >&5
+echo "configure:1961: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1987 "configure"
+#line 1966 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2007,7 +1986,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2034,12 +2013,12 @@ done
 for ac_func in getopt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2037: checking for $ac_func" >&5
+echo "configure:2016: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2042 "configure"
+#line 2021 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2062,7 +2041,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
diff --git a/lib/libkeynote/configure.in b/lib/libkeynote/configure.in
index 4e1c0d222c3..39c536ad264 100644
--- a/lib/libkeynote/configure.in
+++ b/lib/libkeynote/configure.in
@@ -1,4 +1,4 @@
-dnl $OpenBSD: configure.in,v 1.1 1999/10/01 01:08:29 angelos Exp $
+dnl $OpenBSD: configure.in,v 1.2 1999/10/26 22:31:38 angelos Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(assertion.h)
 
@@ -23,16 +23,23 @@ AC_PATH_PROG(ECHO, echo, /bin/echo)
 AC_PATH_PROG(SED, sed, /usr/bin/sed)
 
 dnl Checks for libraries.
-AC_CHECK_LIB(m, floor)
-AC_CHECK_LIB(RSAglue, RSA_ref_private_decrypt)
-AC_CHECK_LIB(rsaref, RSAPrivateDecrypt)
-AC_CHECK_LIB(crypto, i2a_ASN1_STRING)
+LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\
+ -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib"
+
+AC_CHECK_LIB(m, floor, LIBS="$LIBS -lm")
+AC_CHECK_LIB(rsaref, RSAPrivateDecrypt, LIBS="$LIBS -lrsaref")
+AC_CHECK_LIB(crypto, i2a_ASN1_STRING, LIBS="$LIBS -lcrypto")
+AC_CHECK_LIB(RSAglue, RSA_ref_private_encrypt, LIBS="$LIBS -lRSAglue")
 
 dnl Checks for header files.
+CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\
+ -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\
+ -I/usr/local/openssl/include -I/pkg/include"
+
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_CHECK_HEADERS(fcntl.h limits.h unistd.h regex.h sys/time.h io.h)
-AC_CHECK_HEADERS(ssl/crypto.h openssl/crypto.h memory.h)
+AC_CHECK_HEADERS(ssl/crypto.h openssl/crypto.h crypto.h memory.h)
 
 dnl Checks for other files
 AC_CHECK_FILES(/dev/urandom)
diff --git a/lib/libkeynote/environment.c b/lib/libkeynote/environment.c
index fa39a0a2f23..6504b99598d 100644
--- a/lib/libkeynote/environment.c
+++ b/lib/libkeynote/environment.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: environment.c,v 1.8 1999/10/09 19:47:31 angelos Exp $ */
+/*  $OpenBSD: environment.c,v 1.9 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -49,6 +49,7 @@
 #include <unistd.h>
 #endif /* HAVE_IO_H */
 
+#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 
@@ -793,8 +794,8 @@ kn_query(struct environment *env, char **retvalues, int numval,
 
     /* Action set */
     for (en = env; en != (struct environment *) NULL; en = en->env_next)
-      if (kn_add_action(sessid, en->env_name, en->env_value, en->env_flags) ==
-	  -1)
+      if (kn_add_action(sessid, en->env_name, en->env_value,
+          en->env_flags) == -1)
       {
 	  serrno = keynote_errno;
 	  kn_close(sessid);
@@ -804,8 +805,8 @@ kn_query(struct environment *env, char **retvalues, int numval,
 
     /* Locally trusted assertions */
     for (i = 0; i < numtrusted; i++)
-      if (kn_add_assertion(sessid, trusted[i], trustedlen[i],
-	  ASSERT_FLAG_LOCAL) == -1)
+      if ((kn_add_assertion(sessid, trusted[i], trustedlen[i],
+	  ASSERT_FLAG_LOCAL) == -1) && (keynote_errno == ERROR_MEMORY))
       {
 	  serrno = keynote_errno;
 	  kn_close(sessid);
@@ -815,7 +816,8 @@ kn_query(struct environment *env, char **retvalues, int numval,
 
     /* Untrusted assertions */
     for (i = 0; i < numuntrusted; i++)
-      if (kn_add_assertion(sessid, untrusted[i], untrustedlen[i], 0) == -1)
+      if ((kn_add_assertion(sessid, untrusted[i], untrustedlen[i], 0) == -1)
+	  && (keynote_errno == ERROR_MEMORY))
       {
 	  serrno = keynote_errno;
 	  kn_close(sessid);
diff --git a/lib/libkeynote/header.h b/lib/libkeynote/header.h
index 64d2bd4afe9..816ff4e5b30 100644
--- a/lib/libkeynote/header.h
+++ b/lib/libkeynote/header.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: header.h,v 1.4 1999/10/09 19:47:31 angelos Exp $ */
+/* $OpenBSD: header.h,v 1.5 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -26,7 +26,6 @@
 extern void keynote_sign(int, char **), keynote_sigver(int, char **);
 extern void keynote_verify(int, char **), keynote_keygen(int, char **);
 extern void print_key(FILE *, char *, char *, int, int);
-extern void mystrncpy(char *, char *, int);
 extern void print_space(FILE *, int);
 extern int read_environment(char *);
 extern void parse_key(char *);
@@ -39,11 +38,82 @@ int sessid;
 /* Defines */
 #define SEED_LEN        40
 #define RND_BYTES       1024
-#define DEFAULT_PUBLIC    0x10001
+#define DEFAULT_PUBLIC  0x10001
 
 #define KEY_PRINT_OFFSET      12
 #define KEY_PRINT_LENGTH      50
 
 #define SIG_PRINT_OFFSET      12
 #define SIG_PRINT_LENGTH      50
+
+#if !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP)
+#define strcasecmp stricmp
+#endif /* !HAVE_STRCASECMP && HAVE_STRICMP */
+
+#if !defined(HAVE_STRNCASECMP) && defined(HAVE_STRNICMP)
+#define strncasecmp strnicmp
+#endif /* !HAVE_STRNCASECMP && HAVE_STRNICMP */
+
+#if !defined(HAVE_OPEN) && defined(HAVE__OPEN)
+#define open _open
+#endif /* !HAVE_OPEN && HAVE__OPEN */
+
+#if !defined(HAVE_READ) && defined(HAVE__READ)
+#define read _read
+#endif /* !HAVE_READ && HAVE__OPEN */
+
+#if !defined(HAVE_CLOSE) && defined(HAVE__CLOSE)
+#define close _close
+#endif /* !HAVE_CLOSE && HAVE__CLOSE */
+
+#if defined(CRYPTO)
+#if HAVE__DEV_URANDOM
+#define KEYNOTERNDFILENAME "/dev/urandom"
+#else /* HAVE__DEV_URANDOM */
+#error "You need a random device!"
+#endif /* HAVE__DEV_URANDOM */
+#endif /* CRYPTO */
+
+/* Includes */
+#if HAVE_REGEX_H
+#include <sys/types.h>
+#include <regex.h>
+#endif /* HAVE_REGEX_H */
+
+#if defined(CRYPTO)
+#if defined(HAVE_OPENSSL_CRYPTO_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>
+#elif defined(HAVE_SSL_CRYPTO_H)
+#include <ssl/crypto.h>
+#include <ssl/dsa.h>
+#include <ssl/rsa.h>
+#include <ssl/sha.h>
+#include <ssl/md5.h>
+#include <ssl/err.h>
+#include <ssl/rand.h>
+#include <ssl/x509.h>
+#include <ssl/pem.h>
+#elif defined(HAVE_CRYPTO_H)
+#include <crypto.h>
+#include <dsa.h>
+#include <rsa.h>
+#include <sha.h>
+#include <md5.h>
+#include <err.h>
+#include <rand.h>
+#include <x509.h>
+#include <pem.h>
+#else /* HAVE_OPENSSL_CRYPTO_H */
+#error "SSLeay or OpenSSL not detected!"
+#endif /* HAVE_OPENSSL_CRYPTO_H */
+#endif /* CRYPTO */
+
 #endif /* _HEADER_H_ */
diff --git a/lib/libkeynote/keynote-keygen.c b/lib/libkeynote/keynote-keygen.c
index 1736f64c82c..edb4ac7805a 100644
--- a/lib/libkeynote/keynote-keygen.c
+++ b/lib/libkeynote/keynote-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-keygen.c,v 1.7 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote-keygen.c,v 1.8 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -43,10 +43,10 @@
 #include <unistd.h>
 #endif /* HAVE_IO_H */
 
+#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 #include "signature.h"
-#include "header.h"
 
 void
 keygenusage(void)
diff --git a/lib/libkeynote/keynote-sign.c b/lib/libkeynote/keynote-sign.c
index 515009c268d..fa494c8c2af 100644
--- a/lib/libkeynote/keynote-sign.c
+++ b/lib/libkeynote/keynote-sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-sign.c,v 1.8 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote-sign.c,v 1.9 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -43,8 +43,8 @@
 #include <unistd.h>
 #endif /* HAVE_IO_H */
 
-#include "keynote.h"
 #include "header.h"
+#include "keynote.h"
 
 void
 signusage(void)
diff --git a/lib/libkeynote/keynote-sigver.c b/lib/libkeynote/keynote-sigver.c
index 8bf8f333ad3..3a3e68cec7b 100644
--- a/lib/libkeynote/keynote-sigver.c
+++ b/lib/libkeynote/keynote-sigver.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-sigver.c,v 1.7 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote-sigver.c,v 1.8 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -43,8 +43,8 @@
 #include <unistd.h>
 #endif /* HAVE_IO_H */
 
-#include "keynote.h"
 #include "header.h"
+#include "keynote.h"
 
 void
 sigverusage(void)
diff --git a/lib/libkeynote/keynote-ver.l b/lib/libkeynote/keynote-ver.l
index f0f5917bf5e..6d5cc4de362 100644
--- a/lib/libkeynote/keynote-ver.l
+++ b/lib/libkeynote/keynote-ver.l
@@ -1,5 +1,5 @@
 %{
-/* $OpenBSD: keynote-ver.l,v 1.6 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote-ver.l,v 1.7 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -47,8 +47,10 @@
 #endif
 
 #include "z.tab.h"
-#include "keynote.h"
 #include "header.h"
+#include "keynote.h"
+
+static void mystrncpy(char *, char *, int);
 %}
 vstring		[a-zA-Z0-9][a-zA-Z0-9_]*
 litstring	\"(([^\"\n])|(\\[\"\n\f\r\t.]))*\"
diff --git a/lib/libkeynote/keynote-ver.y b/lib/libkeynote/keynote-ver.y
index 5e64661e091..ca953a3806e 100644
--- a/lib/libkeynote/keynote-ver.y
+++ b/lib/libkeynote/keynote-ver.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-ver.y,v 1.6 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote-ver.y,v 1.7 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -40,8 +40,8 @@
 #include <string.h>
 #endif /* STDC_HEADERS */
 
-#include "keynote.h"
 #include "header.h"
+#include "keynote.h"
 %}
 %%
 
diff --git a/lib/libkeynote/keynote-verify.c b/lib/libkeynote/keynote-verify.c
index f8f7f8a5e99..0f234c9ed1a 100644
--- a/lib/libkeynote/keynote-verify.c
+++ b/lib/libkeynote/keynote-verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-verify.c,v 1.7 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote-verify.c,v 1.8 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -54,8 +54,8 @@
 #include <unistd.h>
 #endif /* HAVE_IO_H */
 
-#include "keynote.h"
 #include "header.h"
+#include "keynote.h"
 
 void
 verifyusage(void)
diff --git a/lib/libkeynote/keynote.h b/lib/libkeynote/keynote.h
index 4dc8edde33f..69b1876b35d 100644
--- a/lib/libkeynote/keynote.h
+++ b/lib/libkeynote/keynote.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote.h,v 1.10 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote.h,v 1.11 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -22,21 +22,6 @@
 #ifndef __KEYNOTE_H__
 #define __KEYNOTE_H__
 
-#include <sys/types.h>
-#include <regex.h>
-
-#include <ssl/crypto.h>
-#include <ssl/dsa.h>
-#include <ssl/rsa.h>
-#include <ssl/sha.h>
-#include <ssl/md5.h>
-#include <ssl/err.h>
-#include <ssl/rand.h>
-#include <ssl/x509.h>
-#include <ssl/pem.h>
-
-#define KEYNOTERNDFILENAME "/dev/urandom"
-
 struct environment
 {
     char               *env_name;
diff --git a/lib/libkeynote/keynote.l b/lib/libkeynote/keynote.l
index ef299602916..8068e77c820 100644
--- a/lib/libkeynote/keynote.l
+++ b/lib/libkeynote/keynote.l
@@ -1,5 +1,5 @@
 %{
-/* $OpenBSD: keynote.l,v 1.5 1999/10/09 19:47:32 angelos Exp $ */
+/* $OpenBSD: keynote.l,v 1.6 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -47,6 +47,7 @@
 #endif
 
 #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 fe81a0af93f..689e49caac0 100644
--- a/lib/libkeynote/keynote.y
+++ b/lib/libkeynote/keynote.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote.y,v 1.5 1999/10/09 19:47:33 angelos Exp $ */
+/* $OpenBSD: keynote.y,v 1.6 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -57,6 +57,7 @@
 #include <string.h>
 #endif /* STDC_HEADERS */
 
+#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 
diff --git a/lib/libkeynote/parse_assertion.c b/lib/libkeynote/parse_assertion.c
index cb2489e41aa..13ec503ee59 100644
--- a/lib/libkeynote/parse_assertion.c
+++ b/lib/libkeynote/parse_assertion.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse_assertion.c,v 1.5 1999/10/09 19:47:33 angelos Exp $ */
+/* $OpenBSD: parse_assertion.c,v 1.6 1999/10/26 22:31:38 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -36,6 +36,7 @@
 #include <limits.h>
 #endif /* HAVE_LIMITS_H */
 
+#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 #include "signature.h"
diff --git a/lib/libkeynote/signature.c b/lib/libkeynote/signature.c
index 480c89c4b2a..3e9f0cba5d5 100644
--- a/lib/libkeynote/signature.c
+++ b/lib/libkeynote/signature.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signature.c,v 1.9 1999/10/09 19:47:33 angelos Exp $ */
+/* $OpenBSD: signature.c,v 1.10 1999/10/26 22:31:39 angelos Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -40,6 +40,7 @@
 #include <limits.h>
 #endif /* HAVE_LIMITS_H */
 
+#include "header.h"
 #include "keynote.h"
 #include "assertion.h"
 #include "signature.h"