regress/rsakeygen/rsakeygen.c: Merge with EOM 1.9

regress/x509/x509test.c: Merge with EOM 1.7
DESIGN-NOTES: Merge with EOM 1.48
README.PKI: Merge with EOM 1.6
TO-DO: Merge with EOM 1.44
cert.c: Merge with EOM 1.12

author: niklas
Add support for dynamic loading of optional facilities, libcrypto first.

1 files changed, 4 insertions, 5 deletions

diff --git a/sbin/isakmpd/cert.c b/sbin/isakmpd/cert.c
index c5e88c8155d..4f0c5b041a4 100644
--- a/sbin/isakmpd/cert.c
+++ b/sbin/isakmpd/cert.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: cert.c,v 1.10 1999/07/17 21:54:39 niklas Exp $	*/
-/*	$EOM: cert.c,v 1.11 1999/07/17 20:44:09 niklas Exp $	*/
+/*	$OpenBSD: cert.c,v 1.11 1999/08/26 22:30:46 niklas Exp $	*/
+/*	$EOM: cert.c,v 1.12 1999/08/12 22:34:26 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niels Provos.  All rights reserved.
@@ -50,6 +50,7 @@
 #include "x509.h"
 
 struct cert_handler cert_handler[] = {
+#if defined (USE_LIBCRYPTO) || defined (USE_DLOPEN)
   {
     ISAKMP_CERTENC_X509_SIG, 
     x509_cert_init, x509_cert_get, x509_cert_validate, 
@@ -57,6 +58,7 @@ struct cert_handler cert_handler[] = {
     x509_certreq_validate, x509_certreq_decode, x509_free_aca,
     x509_cert_obtain, x509_cert_get_key, x509_cert_get_subject
   }
+#endif
 };
 
 /* Initialize all certificate handlers */
@@ -66,9 +68,6 @@ cert_init (void)
 {
   int i, err = 1;
 
-  /* Add all algorithms know by SSL */
-  SSLeay_add_all_algorithms ();
-
   for (i = 0; i < sizeof cert_handler / sizeof cert_handler[0]; i++)
     if (cert_handler[i].cert_init && !(*cert_handler[i].cert_init) ())
       err = 0;