Added error checking to global_init() calls.

4 files changed, 29 insertions, 13 deletions

diff --git a/src/certtool.c b/src/certtool.c
index 686d935088..dcf85837b1 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -487,6 +487,8 @@ void update_signed_certificate( void)
 
 void gaa_parser(int argc, char **argv)
 {
+int ret;
+
 	if (gaa(argc, argv, &info) != -1) {
 		fprintf(stderr,
 			"Error in the arguments. Use the --help or -h parameters to get more information.\n");
@@ -515,7 +517,11 @@ void gaa_parser(int argc, char **argv)
 	if (info.outcert_format) out_cert_format = GNUTLS_X509_FMT_DER;
 	else out_cert_format = GNUTLS_X509_FMT_PEM;
 
-	gnutls_global_init();
+	if ((ret=gnutls_global_init()) < 0) {
+		fprintf(stderr, "global_init: %s\n", gnutls_strerror(ret));
+		exit(1);
+	}
+
 	gnutls_global_set_log_function( tls_log_func);
 	gnutls_global_set_log_level(info.debug);
 
diff --git a/src/cli.c b/src/cli.c
index 6bdc3d3f93..1c266b9a79 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -670,16 +670,17 @@ static void init_global_tls_stuff(void)
 {
 	int ret;
 
-	if (gnutls_global_init() < 0) {
-		fprintf(stderr, "global state initialization error\n");
+	if ((ret=gnutls_global_init()) < 0) {
+		fprintf(stderr, "global_init: %s\n", gnutls_strerror(ret));
 		exit(1);
 	}
+
 	gnutls_global_set_log_function(tls_log_func);
 	gnutls_global_set_log_level(debug);
 
-	if (gnutls_global_init_extra() < 0) {
+	if ((ret=gnutls_global_init_extra()) < 0) {
 		fprintf(stderr,
-			"global state (extra) initialization error\n");
+			"global_init_extra: %s\n", gnutls_strerror(ret));
 		exit(1);
 	}
 
diff --git a/src/crypt.c b/src/crypt.c
index 40c665a867..e322bf0664 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -431,8 +431,16 @@ int main(int argc, char **argv)
 	int salt;
 	struct passwd *pwd;
 
-	gnutls_global_init();
-	gnutls_global_init_extra();
+	if ((ret=gnutls_global_init()) < 0) {
+		fprintf(stderr, "global_init: %s\n", gnutls_strerror(ret));
+		exit(1);
+	}
+
+	if ((ret=gnutls_global_init_extra()) < 0) {
+		fprintf(stderr,
+			"global_init_extra: %s\n", gnutls_strerror(ret));
+		exit(1);
+	}
 	
 	if (gaa(argc, argv, &info) != -1) {
 		fprintf(stderr, "Error in the arguments.\n");
diff --git a/src/serv.c b/src/serv.c
index 505cd86211..1e901a8044 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -564,16 +564,17 @@ int main(int argc, char **argv)
       strcpy(name, "Echo Server");
    }
 
-   if (gnutls_global_init() < 0) {
-      fprintf(stderr, "global state initialization error\n");
-      exit(1);
+   if ((ret=gnutls_global_init()) < 0) {
+	fprintf(stderr, "global_init: %s\n", gnutls_strerror(ret));
+	exit(1);
    }
    gnutls_global_set_log_function( tls_log_func);
    gnutls_global_set_log_level(debug);
 
-   if (gnutls_global_init_extra() < 0) {
-      fprintf(stderr, "global state (extra) initialization error\n");
-      exit(1);
+   if ((ret=gnutls_global_init_extra()) < 0) {
+		fprintf(stderr,
+			"global_init_extra: %s\n", gnutls_strerror(ret));
+		exit(1);
    }
 
    /* Note that servers must generate parameters for