1 files changed, 6 insertions, 5 deletions

diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index 5d983e3ed4..202bd168ac 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -462,9 +462,9 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
                 if (i > 2) i=2;
                 l-=(long)(i*40);
 
-                sprintf(tbuf,"%d.%lu",i,l);
+                snprintf(tbuf,sizeof tbuf,"%d.%lu",i,l);
                 i=strlen(tbuf);
-                BUF_strlcpy(buf,tbuf,buf_len);
+                strncpy(buf,tbuf,buf_len);
                 buf_len-=i;
                 buf+=i;
                 n+=i;
@@ -473,10 +473,10 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
                 for (; idx<len; idx++) {
                         l|=p[idx]&0x7f;
                         if (!(p[idx] & 0x80)) {
-                                sprintf(tbuf,".%lu",l);
+                                snprintf(tbuf,sizeof tbuf,".%lu",l);
                                 i=strlen(tbuf);
                                 if (buf_len > 0)
-                                        BUF_strlcpy(buf,tbuf,buf_len);
+                                        strncpy(buf,tbuf,buf_len);
                                 buf_len-=i;
                                 buf+=i;
                                 n+=i;
@@ -488,9 +488,10 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
                 s=OBJ_nid2ln(nid);
                 if (s == NULL)
                         s=OBJ_nid2sn(nid);
-                BUF_strlcpy(buf,s,buf_len);
+                strncpy(buf,s,buf_len);
                 n=strlen(s);
         }
+        buf[buf_len-1]='\0';
         return(n);
 }