Merge pull request #1868 from RincewindsHat/compiler_warning_part_3

Replace deprecated TLS client functions

2 files changed, 29 insertions, 8 deletions

diff --git a/lib/utils_base.c b/lib/utils_base.c
index c458cf61..0f521263 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -402,26 +402,45 @@ int mp_translate_state (char *state_text) {
  * parse of argv, so that uniqueness in parameters are reflected there.
  */
 char *_np_state_generate_key() {
-        struct sha256_ctx ctx;
         int i;
         char **argv = this_monitoring_plugin->argv;
-        unsigned char result[20];
         char keyname[41];
         char *p=NULL;
 
-        sha256_init_ctx(&ctx);
-        
+        unsigned char result[256];
+
+#ifdef USE_OPENSSL
+        /*
+         * This code path is chosen if openssl is available (which should be the most common
+         * scenario). Alternatively, the gnulib implementation/
+         *
+         */
+        EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+
+        EVP_DigestInit(ctx, EVP_sha256());
+
+        for(i=0; i<this_monitoring_plugin->argc; i++) {
+                EVP_DigestUpdate(ctx, argv[i], strlen(argv[i]));
+        }
+
+        EVP_DigestFinal(ctx, result, NULL);
+#else
+
+        struct sha256_ctx ctx;
+
         for(i=0; i<this_monitoring_plugin->argc; i++) {
                 sha256_process_bytes(argv[i], strlen(argv[i]), &ctx);
         }
 
-        sha256_finish_ctx(&ctx, &result);
-        
+        sha256_finish_ctx(&ctx, result);
+#endif // FOUNDOPENSSL
+
         for (i=0; i<20; ++i) {
                 sprintf(&keyname[2*i], "%02x", result[i]);
         }
+
         keyname[40]='\0';
-        
+
         p = strdup(keyname);
         if(p==NULL) {
                 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 59065504..9cb42767 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -2,7 +2,9 @@
 #define _UTILS_BASE_
 /* Header file for Monitoring Plugins utils_base.c */
 
-#include "sha256.h"
+#ifndef USE_OPENSSL
+# include "sha256.h"
+#endif
 
 /* This file holds header information for thresholds - use this in preference to 
    individual plugin logic */