openssl-engine-0.9.6 merge

1 files changed, 7 insertions, 1 deletions

diff --git a/src/lib/libcrypto/conf/test.c b/src/lib/libcrypto/conf/test.c
index 9390a48baf..7fab85053e 100644
--- a/src/lib/libcrypto/conf/test.c
+++ b/src/lib/libcrypto/conf/test.c
@@ -67,7 +67,10 @@ main()
         long eline;
         char *s,*s2;
 
-        conf=CONF_load(NULL,"openssl.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();
@@ -88,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);
         }