2 files changed, 2 insertions, 5 deletions

diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index b5512895a1..ccf2f6e0bf 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -246,13 +246,11 @@ add_cert_dir(BY_DIR *ctx, const char *dir, int type)
                                 return 0;
                         ent->dir_type = type;
                         ent->hashes = sk_BY_DIR_HASH_new(by_dir_hash_cmp);
-                        ent->dir = OPENSSL_malloc((unsigned int)len + 1);
+                        ent->dir = strdup(ss);
                         if (!ent->dir || !ent->hashes) {
                                 by_dir_entry_free(ent);
                                 return 0;
                         }
-                        strncpy(ent->dir, ss,(unsigned int)len);
-                        ent->dir[len] = '\0';
                         if (!sk_BY_DIR_ENTRY_push(ctx->dirs, ent)) {
                                 by_dir_entry_free(ent);
                                 return 0;
diff --git a/src/lib/libcrypto/x509/x509_obj.c b/src/lib/libcrypto/x509/x509_obj.c
index bcc1e7429e..1d3cf547d7 100644
--- a/src/lib/libcrypto/x509/x509_obj.c
+++ b/src/lib/libcrypto/x509/x509_obj.c
@@ -90,8 +90,7 @@ int i;
                 buf=b->data;
                 OPENSSL_free(b);
                 }
-            strncpy(buf,"NO X509_NAME",len);
-            buf[len-1]='\0';
+            strlcpy(buf,"NO X509_NAME",len);
             return buf;
             }