projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
warning.
[oweals/openssl.git]
/
crypto
/
asn1
/
t_x509.c
diff --git
a/crypto/asn1/t_x509.c
b/crypto/asn1/t_x509.c
index 12e170488f6b16bb8da5964a05055e3d58cf5666..6ee1065ce9468c081f087d24dc3d2ecdf65c6e4f 100644
(file)
--- a/
crypto/asn1/t_x509.c
+++ b/
crypto/asn1/t_x509.c
@@
-58,22
+58,20
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"buffer.h"
-#include
"bn.h"
+#include
<openssl/buffer.h>
+#include
<openssl/bn.h>
#ifndef NO_RSA
#ifndef NO_RSA
-#include
"rsa.h"
+#include
<openssl/rsa.h>
#endif
#ifndef NO_DSA
#endif
#ifndef NO_DSA
-#include
"dsa.h"
+#include
<openssl/dsa.h>
#endif
#endif
-#include
"objects.h"
-#include
"x509.h"
-#include
"x509v3.h"
+#include
<openssl/objects.h>
+#include
<openssl/x509.h>
+#include
<openssl/x509v3.h>
#ifndef NO_FP_API
#ifndef NO_FP_API
-int X509_print_fp(fp,x)
-FILE *fp;
-X509 *x;
+int X509_print_fp(FILE *fp, X509 *x)
{
BIO *b;
int ret;
{
BIO *b;
int ret;
@@
-90,9
+88,7
@@
X509 *x;
}
#endif
}
#endif
-int X509_print(bp,x)
-BIO *bp;
-X509 *x;
+int X509_print(BIO *bp, X509 *x)
{
long l;
int ret=0,i,j,n;
{
long l;
int ret=0,i,j,n;
@@
-100,7
+96,7
@@
X509 *x;
X509_CINF *ci;
ASN1_INTEGER *bs;
EVP_PKEY *pkey=NULL;
X509_CINF *ci;
ASN1_INTEGER *bs;
EVP_PKEY *pkey=NULL;
- char *neg;
+ c
onst c
har *neg;
X509_EXTENSION *ex;
ASN1_STRING *str=NULL;
X509_EXTENSION *ex;
ASN1_STRING *str=NULL;
@@
-162,6
+158,7
@@
X509 *x;
if (pkey == NULL)
{
BIO_printf(bp,"%12sUnable to load Public Key\n","");
if (pkey == NULL)
{
BIO_printf(bp,"%12sUnable to load Public Key\n","");
+ ERR_print_errors(bp);
}
else
#ifndef NO_RSA
}
else
#ifndef NO_RSA
@@
-191,11
+188,7
@@
X509 *x;
BIO_printf(bp,"%8sX509v3 extensions:\n","");
for (i=0; i<n; i++)
{
BIO_printf(bp,"%8sX509v3 extensions:\n","");
for (i=0; i<n; i++)
{
-#if 0
- int data_type,pack_type;
-#endif
ASN1_OBJECT *obj;
ASN1_OBJECT *obj;
-
ex=X509_get_ext(x,i);
if (BIO_printf(bp,"%12s","") <= 0) goto err;
obj=X509_EXTENSION_get_object(ex);
ex=X509_get_ext(x,i);
if (BIO_printf(bp,"%12s","") <= 0) goto err;
obj=X509_EXTENSION_get_object(ex);
@@
-206,7
+199,7
@@
X509 *x;
if(!X509V3_EXT_print(bp, ex, 0, 16))
{
BIO_printf(bp, "%16s", "");
if(!X509V3_EXT_print(bp, ex, 0, 16))
{
BIO_printf(bp, "%16s", "");
- ASN1_OCTET_STRING_print(bp,ex->value);
+
M_
ASN1_OCTET_STRING_print(bp,ex->value);
}
if (BIO_write(bp,"\n",1) <= 0) goto err;
}
}
if (BIO_write(bp,"\n",1) <= 0) goto err;
}
@@
-226,16
+219,15
@@
X509 *x;
((i+1) == n)?"":":") <= 0) goto err;
}
if (BIO_write(bp,"\n",1) != 1) goto err;
((i+1) == n)?"":":") <= 0) goto err;
}
if (BIO_write(bp,"\n",1) != 1) goto err;
+ if (!X509_CERT_AUX_print(bp, x->aux, 0)) goto err;
ret=1;
err:
if (str != NULL) ASN1_STRING_free(str);
ret=1;
err:
if (str != NULL) ASN1_STRING_free(str);
- if (m != NULL) Free(
(char *)
m);
+ if (m != NULL) Free(m);
return(ret);
}
return(ret);
}
-int ASN1_STRING_print(bp,v)
-BIO *bp;
-ASN1_STRING *v;
+int ASN1_STRING_print(BIO *bp, ASN1_STRING *v)
{
int i,n;
char buf[80],*p;;
{
int i,n;
char buf[80],*p;;
@@
-264,9
+256,7
@@
ASN1_STRING *v;
return(1);
}
return(1);
}
-int ASN1_TIME_print(bp, tm)
-BIO *bp;
-ASN1_TIME *tm;
+int ASN1_TIME_print(BIO *bp, ASN1_TIME *tm)
{
if(tm->type == V_ASN1_UTCTIME) return ASN1_UTCTIME_print(bp, tm);
if(tm->type == V_ASN1_GENERALIZEDTIME)
{
if(tm->type == V_ASN1_UTCTIME) return ASN1_UTCTIME_print(bp, tm);
if(tm->type == V_ASN1_GENERALIZEDTIME)
@@
-275,16
+265,16
@@
ASN1_TIME *tm;
return(0);
}
return(0);
}
+static const char *mon[12]=
+ {
+ "Jan","Feb","Mar","Apr","May","Jun",
+ "Jul","Aug","Sep","Oct","Nov","Dec"
+ };
-int ASN1_GENERALIZEDTIME_print(bp,tm)
-BIO *bp;
-ASN1_GENERALIZEDTIME *tm;
+int ASN1_GENERALIZEDTIME_print(BIO *bp, ASN1_GENERALIZEDTIME *tm)
{
char *v;
int gmt=0;
{
char *v;
int gmt=0;
- static char *mon[12]={
- "Jan","Feb","Mar","Apr","May","Jun",
- "Jul","Aug","Sep","Oct","Nov","Dec"};
int i;
int y=0,M=0,d=0,h=0,m=0,s=0;
int i;
int y=0,M=0,d=0,h=0,m=0,s=0;
@@
-315,15
+305,10
@@
err:
return(0);
}
return(0);
}
-int ASN1_UTCTIME_print(bp,tm)
-BIO *bp;
-ASN1_UTCTIME *tm;
+int ASN1_UTCTIME_print(BIO *bp, ASN1_UTCTIME *tm)
{
char *v;
int gmt=0;
{
char *v;
int gmt=0;
- static char *mon[12]={
- "Jan","Feb","Mar","Apr","May","Jun",
- "Jul","Aug","Sep","Oct","Nov","Dec"};
int i;
int y=0,M=0,d=0,h=0,m=0,s=0;
int i;
int y=0,M=0,d=0,h=0,m=0,s=0;
@@
-355,10
+340,7
@@
err:
return(0);
}
return(0);
}
-int X509_NAME_print(bp,name,obase)
-BIO *bp;
-X509_NAME *name;
-int obase;
+int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
{
char *s,*c;
int ret=0,l,ll,i,first=1;
{
char *s,*c;
int ret=0,l,ll,i,first=1;
@@
-373,6
+355,7
@@
int obase;
c=s;
for (;;)
{
c=s;
for (;;)
{
+#ifndef CHARSET_EBCDIC
if ( ((*s == '/') &&
((s[1] >= 'A') && (s[1] <= 'Z') && (
(s[2] == '=') ||
if ( ((*s == '/') &&
((s[1] >= 'A') && (s[1] <= 'Z') && (
(s[2] == '=') ||
@@
-380,6
+363,15
@@
int obase;
(s[3] == '='))
))) ||
(*s == '\0'))
(s[3] == '='))
))) ||
(*s == '\0'))
+#else
+ if ( ((*s == '/') &&
+ (isupper(s[1]) && (
+ (s[2] == '=') ||
+ (isupper(s[2]) &&
+ (s[3] == '='))
+ ))) ||
+ (*s == '\0'))
+#endif
{
if ((l <= 0) && !first)
{
{
if ((l <= 0) && !first)
{