...G...PS. [ZBXNEXT-4836] added license information and OpenSSL linki…

…ng exception to README file, show crypto library version when started with '-V'

git-svn-id: svn://svn.zabbix.com/trunk@86122 97f52cf1-0a1b-0410-bd0e-c28be96e8082

ChangeLog

@@ -9,6 +9,7 @@ Bug fixes:
 Changes for 4.0.2rc1
 
 New features:
+...G...PS. [ZBXNEXT-4836] added license information and OpenSSL linking exception to README file, show crypto library version when started with '-V' (Andris)
 
 Bug fixes:
 
@@ -604,6 +605,7 @@ Bug fixes:
 Changes for 3.4.15rc1
 
 New features:
+...G...PS. [ZBXNEXT-4836] added license information and OpenSSL linking exception to README file, show crypto library version when started with '-V' (Andris)
 .......PS. [ZBXNEXT-4782] improve out of memory error message by adding statistics and backtrace; improve something impossible has just happened error message by adding backtrace (vso)
 
 Bug fixes:
@@ -1985,6 +1987,7 @@ A......... [ZBX-10049] fixed optional field validation in drule.update API metho
 Changes for 3.0.24rc1
 
 New features:
+...G...PS. [ZBXNEXT-4836] added license information and OpenSSL linking exception to README file, show crypto library version when started with '-V' (Andris)
 
 Bug fixes:
 

README

@@ -1,2 +1,25 @@
+Zabbix is free software, released under the GNU General Public License
+(GPL) version 2.
+
+You can redistribute it and/or modify it under the terms of the GNU GPL
+as published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The formal terms of the GPL can be found at
+http://www.fsf.org/licenses/ .
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+Exception for linking with OpenSSL
+
+In addition, as a special exception, we give permission to link the code
+of Zabbix with the OpenSSL project OpenSSL library (or with modified
+versions of it that use the same license as the OpenSSL library), and
+distribute the linked executables.
+
 Please see http://www.zabbix.com/ for detailed information about Zabbix.
-On-line Zabbix documentation is available at http://www.zabbix.com/documentation/4.0/manual/installation/install .
+On-line Zabbix documentation is available at
+http://www.zabbix.com/documentation/4.0/manual/installation/install .

src/libs/zbxcommon/str.c

@@ -21,6 +21,8 @@
 #include "threads.h"
 #include "module.h"
 
+#include "../zbxcrypto/tls.h"
+
 #ifdef HAVE_ICONV
 #	include <iconv.h>
 #endif
@@ -54,6 +56,10 @@ void	version(void)
 	printf("%s (Zabbix) %s\n", title_message, ZABBIX_VERSION);
 	printf("Revision %s %s, compilation time: %s %s\n\n", ZABBIX_REVISION, ZABBIX_REVDATE, __DATE__, __TIME__);
 	puts(copyright_message);
+#if defined(HAVE_POLARSSL) || defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
+	printf("\n");
+	zbx_tls_version();
+#endif
 }
 
 /******************************************************************************

src/libs/zbxcrypto/tls.c

@@ -486,6 +486,27 @@ static void	zbx_tls_cert_error_msg(unsigned int flags, char **error)
 }
 #endif
 
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_tls_version                                                  *
+ *                                                                            *
+ * Purpose: print tls library version on stdout by application request with   *
+ *          parameter '-V'                                                    *
+ *                                                                            *
+ ******************************************************************************/
+void	zbx_tls_version(void)
+{
+#if defined(HAVE_POLARSSL)
+	printf("Compiled with %s\n", POLARSSL_VERSION_STRING_FULL);
+#elif defined(HAVE_GNUTLS)
+	printf("Compiled with GnuTLS %s\nRunning with GnuTLS %s\n", GNUTLS_VERSION, gnutls_check_version(NULL));
+#elif defined(HAVE_OPENSSL)
+	printf("This product includes software developed by the OpenSSL Project\n"
+			"for use in the OpenSSL Toolkit (http://www.openssl.org/).\n\n");
+	printf("Compiled with %s\nRunning with %s\n", OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
+#endif
+}
+
 /******************************************************************************
  *                                                                            *
  * Function: zbx_tls_parameter_name                                           *

src/libs/zbxcrypto/tls.h

@@ -79,6 +79,7 @@ void	zbx_tls_init_parent(void);
 void	zbx_tls_init_child(void);
 void	zbx_tls_free(void);
 void	zbx_tls_free_on_signal(void);
+void	zbx_tls_version(void);
 
 #endif	/* #if defined(HAVE_POLARSSL) || defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) */