Andreas Krennmair:

	- show OpenSSL library version on -v screen if enabled.
	- disable SSL v2 by default. It is still available, but must be
	  enabled explicitly, due to security reasons:
	  http://www.mozillazine.org/talkback.html?article=7252

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@561 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index c7884c0..faea12c 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-560
+561

diff --git a/init.h b/init.h
index fecccfc..6bb6a05 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2664,7 +2664,7 @@ struct option_t MuttVars[] = {
    ** The file which includes random data that is used to initialize SSL
    ** library functions.
    */
-  {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "yes" },
+  {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" },
   /*
    ** .pp
    ** Availability: SSL

diff --git a/main.c b/main.c
index d604a54..9431929 100644 (file)
--- a/main.c
+++ b/main.c
@@ -74,6 +74,10 @@
 #include <gpgme.h>
 #endif
 
+#ifdef USE_SSL
+#include <openssl/opensslv.h>
+#endif
+
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
 To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
@@ -240,6 +244,10 @@ static void show_version (void)
   printf ("  gnutls %s\n", LIBGNUTLS_VERSION);
 #endif
 
+#ifdef USE_SSL
+  printf ("  %s\n",OPENSSL_VERSION_TEXT);
+#endif
+
 #ifdef CRYPT_BACKEND_GPGME
   printf ("  gpgme %s\n", GPGME_VERSION);
 #endif