Constify d2i, s2i, c2i and r2i functions and other associated

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 6e72f1183d990eb00773506f0ba25323a748a1bd..eae1fedcd33c19543c15cc0d5d1b6d2b7610c6a9 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -758,7 +758,7 @@ X509 *load_cert(BIO *err, const char *file, int format,
                x=d2i_X509_bio(cert,NULL);
        else if (format == FORMAT_NETSCAPE)
                {
-               unsigned char *p,*op;
+               const unsigned char *p,*op;
                int size=0,i;
 
                /* We sort of have to do it this way because it is sort of nice
@@ -1396,14 +1396,16 @@ int load_config(BIO *err, CONF *cnf)
 char *make_config_name()
        {
        const char *t=X509_get_default_cert_area();
+       size_t len;
        char *p;
 
-       p=OPENSSL_malloc(strlen(t)+strlen(OPENSSL_CONF)+2);
-       strcpy(p,t);
+       len=strlen(t)+strlen(OPENSSL_CONF)+2;
+       p=OPENSSL_malloc(len);
+       BUF_strlcpy(p,t,len);
 #ifndef OPENSSL_SYS_VMS
-       strcat(p,"/");
+       BUF_strlcat(p,"/",len);
 #endif
-       strcat(p,OPENSSL_CONF);
+       BUF_strlcat(p,OPENSSL_CONF,len);
 
        return p;
        }