Add X9.42 DH test.

[openssl.git] / crypto / x509 / x509_obj.c

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 691b71f03158345539a6e0da95784d1770e80d7a..21fed9f838d63959dab37b1d9c526494eb9c6708 100644 (file)
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -72,7 +72,7 @@ int i;
        char *p;
        unsigned char *q;
        BUF_MEM *b=NULL;
-       static char hex[17]="0123456789ABCDEF";
+       static const char hex[17]="0123456789ABCDEF";
        int gs_doit[4];
        char tmp_buf[80];
 #ifdef CHARSET_EBCDIC
@@ -91,9 +91,10 @@ int i;
            if(b)
                {
                buf=b->data;
-               Free(b);
+               OPENSSL_free(b);
                }
            strncpy(buf,"NO X509_NAME",len);
+           buf[len-1]='\0';
            return buf;
            }
 
@@ -210,10 +211,12 @@ int i;
        if (b != NULL)
                {
                p=b->data;
-               Free(b);
+               OPENSSL_free(b);
                }
        else
                p=buf;
+       if (i == 0)
+               *p = '\0';
        return(p);
 err:
        X509err(X509_F_X509_NAME_ONELINE,ERR_R_MALLOC_FAILURE);