projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support verify_depth from the SSL API without need for user-defined
[oweals/openssl.git]
/
crypto
/
x509
/
x509_obj.c
diff --git
a/crypto/x509/x509_obj.c
b/crypto/x509/x509_obj.c
index 2b53af1e6122ef09c9b5f5d2fbf703d7c8eed67a..188457872a4ed56fbf1658e5d132c68c94ad5b8e 100644
(file)
--- a/
crypto/x509/x509_obj.c
+++ b/
crypto/x509/x509_obj.c
@@
-1,5
+1,5
@@
/* crypto/x509/x509_obj.c */
/* crypto/x509/x509_obj.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-58,26
+58,24
@@
#include <stdio.h>
#include "cryptlib.h"
#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;
{
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];
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;
if (buf == NULL)
{
if ((b=BUF_MEM_new()) == NULL) goto err;
@@
-85,6
+83,16
@@
int len;
b->data[0]='\0';
len=200;
}
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;
len--; /* space for '\0' */
l=0;
@@
-92,12
+100,10
@@
int len;
{
ne=(X509_NAME_ENTRY *)sk_value(a->entries,i);
n=OBJ_obj2nid(ne->object);
{
ne=(X509_NAME_ENTRY *)sk_value(a->entries,i);
n=OBJ_obj2nid(ne->object);
- if (n == NID_undef)
- s="UNKNOWN";
- else
+ if ((n == NID_undef) || ((s=OBJ_nid2sn(n)) == NULL))
{
{
-
s=OBJ_nid2sn(n
);
-
if (s == NULL) s="UNKNOWN2"
;
+
i2t_ASN1_OBJECT(tmp_buf,sizeof(tmp_buf),ne->object
);
+
s=tmp_buf
;
}
l1=strlen(s);
}
l1=strlen(s);
@@
-167,7
+173,7
@@
int len;
if (b != NULL)
{
p=b->data;
if (b != NULL)
{
p=b->data;
- Free(
(char *)
b);
+ Free(b);
}
else
p=buf;
}
else
p=buf;