Ignore Makefile.save

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

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index c0576fd6f6f40e5bca9f1796dcc82ee2d6f72e04..188457872a4ed56fbf1658e5d132c68c94ad5b8e 100644 (file)
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -58,27 +58,24 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "lhash.h"
-#include "objects.h"
-#include "x509.h"
-#include "buffer.h"
+#include <openssl/lhash.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/buffer.h>
 
-char *X509_NAME_oneline(a,buf,len)
-X509_NAME *a;
-char *buf;
-int len;
+char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
        {
        X509_NAME_ENTRY *ne;
        unsigned int i;
        int n,lold,l,l1,l2,num,j,type;
-       char *s,*p;
+       const char *s;
+       char *p;
        unsigned char *q;
        BUF_MEM *b=NULL;
        static char hex[17]="0123456789ABCDEF";
        int gs_doit[4];
        char tmp_buf[80];
 
-       if (a == NULL) return("NO X509_NAME");
        if (buf == NULL)
                {
                if ((b=BUF_MEM_new()) == NULL) goto err;
@@ -86,6 +83,16 @@ int len;
                b->data[0]='\0';
                len=200;
                }
+       if (a == NULL)
+           {
+           if(b)
+               {
+               buf=b->data;
+               Free(b);
+               }
+           strncpy(buf,"NO X509_NAME",len);
+           return buf;
+           }
 
        len--; /* space for '\0' */
        l=0;
@@ -166,7 +173,7 @@ int len;
        if (b != NULL)
                {
                p=b->data;
-               Free((char *)b);
+               Free(b);
                }
        else
                p=buf;