diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
index 958089609670ff32f90b9e3d7d1835e0e447c1d2..b9be9995e16938f175a534466db9c30f112f708e 100644
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509v3/v3_addr.c
@@ -66,6 +66,7 @@
 #include <openssl/conf.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
+#include <openssl/buffer.h>
 #include <openssl/x509v3.h>
 
 #ifndef OPENSSL_NO_RFC3779
@@ -934,7 +935,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
     length = length_from_afi(afi);
 
     /*
-     * Handle SAFI, if any, and strdup() so we can null-terminate
+     * Handle SAFI, if any, and BUF_strdup() so we can null-terminate
      * the other input values.
      */
     if (safi != NULL) {
@@ -946,9 +947,9 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
 	goto err;
       }
       t += strspn(t, " \t");
-      s = strdup(t);
+      s = BUF_strdup(t);
     } else {
-      s = strdup(val->value);
+      s = BUF_strdup(val->value);
     }
     if (s == NULL) {
       X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
diff --git a/engines/ccgost/gost_ctl.c b/engines/ccgost/gost_ctl.c
index e31e1f977604b7554e857b3a46e797d71b4942a0..d94089b9cbaf9b07b4ade54705bcb85429c044d5 100644
--- a/engines/ccgost/gost_ctl.c
+++ b/engines/ccgost/gost_ctl.c
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/engine.h>
+#include <openssl/buffer.h>
 #include "gost_lcl.h"
 
 static char *gost_params[GOST_PARAM_MAX+1]={NULL};
@@ -54,7 +55,7 @@ const char *get_gost_engine_param(int param)
 	tmp = getenv(gost_envnames[param]);
 	if (tmp) 
 		{
-		gost_params[param] = strdup(tmp);
+		gost_params[param] = BUF_strdup(tmp);
 		return gost_params[param];
 		}	
 	return NULL;
@@ -68,7 +69,7 @@ int gost_set_default_param(int param, const char *value)
 	/* if there is value in the environment, use it, else -passed string * */
 	if (!tmp) tmp=value;
 	if (gost_params[param]) free(gost_params[param]);
-	gost_params[param] = strdup(tmp);
+	gost_params[param] = BUF_strdup(tmp);
 
 	return 1;
 	}