import openssl-0.9.7-beta1

2 files changed, 15 insertions, 8 deletions

diff --git a/src/lib/libcrypto/conf/cnf_save.c b/src/lib/libcrypto/conf/cnf_save.c
index c9018de10e..1439487526 100644
--- a/src/lib/libcrypto/conf/cnf_save.c
+++ b/src/lib/libcrypto/conf/cnf_save.c
@@ -57,28 +57,28 @@
  */
 
 #include <stdio.h>
-#include "conf.h"
+#include <openssl/conf.h>
 
-void print_conf(CONF_VALUE *cv);
+static void print_conf(CONF_VALUE *cv);
+static IMPLEMENT_LHASH_DOALL_FN(print_conf, CONF_VALUE *);
 
 main()
         {
         LHASH *conf;
         long l;
 
-        conf=CONF_load(NULL,"../../apps/ssleay.cnf",&l);
+        conf=CONF_load(NULL,"../../apps/openssl.cnf",&l);
         if (conf == NULL)
                 {
                 fprintf(stderr,"error loading config, line %ld\n",l);
                 exit(1);
                 }
 
-        lh_doall(conf,print_conf);
+        lh_doall(conf,LHASH_DOALL_FN(print_conf));
         }
 
 
-void print_conf(cv)
-CONF_VALUE *cv;
+static void print_conf(CONF_VALUE *cv)
         {
         int i;
         CONF_VALUE *v;
diff --git a/src/lib/libcrypto/conf/test.c b/src/lib/libcrypto/conf/test.c
index 899ee2a067..7fab85053e 100644
--- a/src/lib/libcrypto/conf/test.c
+++ b/src/lib/libcrypto/conf/test.c
@@ -58,7 +58,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "conf.h"
+#include <openssl/conf.h>
+#include <openssl/err.h>
 
 main()
         {
@@ -66,7 +67,10 @@ main()
         long eline;
         char *s,*s2;
 
-        conf=CONF_load(NULL,"ssleay.conf",&eline);
+#ifdef USE_WIN32
+        CONF_set_default_method(CONF_WIN32);
+#endif
+        conf=CONF_load(NULL,"ssleay.cnf",&eline);
         if (conf == NULL)
                 {
                 ERR_load_crypto_strings();
@@ -87,5 +91,8 @@ main()
         s=CONF_get_string(conf,"s_client","cipher1");
         printf("s_client:cipher1=%s\n",(s == NULL)?"NULL":s);
 
+        printf("---------------------------- DUMP ------------------------\n");
+        CONF_dump_fp(conf, stdout);
+
         exit(0);
         }