summaryrefslogtreecommitdiff
path: root/lib/libcrypto/asn1/t_x509.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libcrypto/asn1/t_x509.c')
-rw-r--r--lib/libcrypto/asn1/t_x509.c146
1 files changed, 73 insertions, 73 deletions
diff --git a/lib/libcrypto/asn1/t_x509.c b/lib/libcrypto/asn1/t_x509.c
index 8dfda07b92b..30d49cc4dd0 100644
--- a/lib/libcrypto/asn1/t_x509.c
+++ b/lib/libcrypto/asn1/t_x509.c
@@ -76,9 +76,9 @@
#ifndef OPENSSL_NO_FP_API
int X509_print_fp(FILE *fp, X509 *x)
- {
+{
return X509_print_ex_fp(fp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
- }
+}
int X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cflag)
{
@@ -86,10 +86,10 @@ int X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cfla
int ret;
if ((b=BIO_new(BIO_s_file())) == NULL)
- {
+ {
X509err(X509_F_X509_PRINT_EX_FP,ERR_R_BUF_LIB);
return(0);
- }
+ }
BIO_set_fp(b,fp,BIO_NOCLOSE);
ret=X509_print_ex(b, x, nmflag, cflag);
BIO_free(b);
@@ -103,7 +103,7 @@ int X509_print(BIO *bp, X509 *x)
}
int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
- {
+{
long l;
int ret=0,i;
char *m=NULL,mlch = ' ';
@@ -123,51 +123,51 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
ci=x->cert_info;
if(!(cflag & X509_FLAG_NO_HEADER))
- {
+ {
if (BIO_write(bp,"Certificate:\n",13) <= 0) goto err;
if (BIO_write(bp," Data:\n",10) <= 0) goto err;
- }
+ }
if(!(cflag & X509_FLAG_NO_VERSION))
- {
+ {
l=X509_get_version(x);
if (BIO_printf(bp,"%8sVersion: %lu (0x%lx)\n","",l+1,l) <= 0) goto err;
- }
+ }
if(!(cflag & X509_FLAG_NO_SERIAL))
- {
+ {
if (BIO_write(bp," Serial Number:",22) <= 0) goto err;
bs=X509_get_serialNumber(x);
if (bs->length <= (int)sizeof(long))
- {
+ {
l=ASN1_INTEGER_get(bs);
if (bs->type == V_ASN1_NEG_INTEGER)
- {
+ {
l= -l;
neg="-";
- }
+ }
else
neg="";
if (BIO_printf(bp," %s%lu (%s0x%lx)\n",neg,l,neg,l) <= 0)
goto err;
- }
+ }
else
- {
+ {
neg=(bs->type == V_ASN1_NEG_INTEGER)?" (Negative)":"";
if (BIO_printf(bp,"\n%12s%s","",neg) <= 0) goto err;
for (i=0; i<bs->length; i++)
- {
+ {
if (BIO_printf(bp,"%02x%c",bs->data[i],
((i+1 == bs->length)?'\n':':')) <= 0)
goto err;
- }
}
-
}
+ }
+
if(!(cflag & X509_FLAG_NO_SIGNAME))
- {
+ {
if(X509_signature_print(bp, x->sig_alg, NULL) <= 0)
goto err;
#if 0
@@ -178,31 +178,31 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
if (BIO_puts(bp, "\n") <= 0)
goto err;
#endif
- }
+ }
if(!(cflag & X509_FLAG_NO_ISSUER))
- {
+ {
if (BIO_printf(bp," Issuer:%c",mlch) <= 0) goto err;
if (X509_NAME_print_ex(bp,X509_get_issuer_name(x),nmindent, nmflags) < 0) goto err;
if (BIO_write(bp,"\n",1) <= 0) goto err;
- }
+ }
if(!(cflag & X509_FLAG_NO_VALIDITY))
- {
+ {
if (BIO_write(bp," Validity\n",17) <= 0) goto err;
if (BIO_write(bp," Not Before: ",24) <= 0) goto err;
if (!ASN1_TIME_print(bp,X509_get_notBefore(x))) goto err;
if (BIO_write(bp,"\n Not After : ",25) <= 0) goto err;
if (!ASN1_TIME_print(bp,X509_get_notAfter(x))) goto err;
if (BIO_write(bp,"\n",1) <= 0) goto err;
- }
+ }
if(!(cflag & X509_FLAG_NO_SUBJECT))
- {
+ {
if (BIO_printf(bp," Subject:%c",mlch) <= 0) goto err;
if (X509_NAME_print_ex(bp,X509_get_subject_name(x),nmindent, nmflags) < 0) goto err;
if (BIO_write(bp,"\n",1) <= 0) goto err;
- }
+ }
if(!(cflag & X509_FLAG_NO_PUBKEY))
- {
+ {
if (BIO_write(bp," Subject Public Key Info:\n",33) <= 0)
goto err;
if (BIO_printf(bp,"%12sPublic Key Algorithm: ","") <= 0)
@@ -214,37 +214,37 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
pkey=X509_get_pubkey(x);
if (pkey == NULL)
- {
+ {
BIO_printf(bp,"%12sUnable to load Public Key\n","");
ERR_print_errors(bp);
- }
+ }
else
- {
+ {
EVP_PKEY_print_public(bp, pkey, 16, NULL);
EVP_PKEY_free(pkey);
- }
}
+ }
if (!(cflag & X509_FLAG_NO_EXTENSIONS))
X509V3_extensions_print(bp, "X509v3 extensions",
ci->extensions, cflag, 8);
if(!(cflag & X509_FLAG_NO_SIGDUMP))
- {
+ {
if(X509_signature_print(bp, x->sig_alg, x->signature) <= 0) goto err;
- }
+ }
if(!(cflag & X509_FLAG_NO_AUX))
- {
+ {
if (!X509_CERT_AUX_print(bp, x->aux, 0)) goto err;
- }
+ }
ret=1;
err:
if (m != NULL) free(m);
return(ret);
- }
+}
int X509_ocspid_print (BIO *bp, X509 *x)
- {
+{
unsigned char *der=NULL ;
unsigned char *dertmp;
int derlen;
@@ -263,9 +263,9 @@ int X509_ocspid_print (BIO *bp, X509 *x)
if (!EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL))
goto err;
for (i=0; i < SHA_DIGEST_LENGTH; i++)
- {
+ {
if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0) goto err;
- }
+ }
free (der);
der=NULL;
@@ -279,17 +279,17 @@ int X509_ocspid_print (BIO *bp, X509 *x)
SHA1md, NULL, EVP_sha1(), NULL))
goto err;
for (i=0; i < SHA_DIGEST_LENGTH; i++)
- {
+ {
if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0)
goto err;
- }
+ }
BIO_printf(bp,"\n");
return (1);
err:
if (der != NULL) free(der);
return(0);
- }
+}
int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
{
@@ -299,15 +299,15 @@ int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
n=sig->length;
s=sig->data;
for (i=0; i<n; i++)
- {
+ {
if ((i%18) == 0)
- {
+ {
if (BIO_write(bp,"\n",1) <= 0) return 0;
if (BIO_indent(bp, indent, indent) <= 0) return 0;
- }
+ }
if (BIO_printf(bp,"%02x%s",s[i],
((i+1) == n)?"":":") <= 0) return 0;
- }
+ }
if (BIO_write(bp,"\n",1) != 1) return 0;
return 1;
@@ -321,16 +321,16 @@ int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
sig_nid = OBJ_obj2nid(sigalg->algorithm);
if (sig_nid != NID_undef)
- {
+ {
int pkey_nid, dig_nid;
const EVP_PKEY_ASN1_METHOD *ameth;
if (OBJ_find_sigid_algs(sig_nid, &dig_nid, &pkey_nid))
- {
+ {
ameth = EVP_PKEY_asn1_find(NULL, pkey_nid);
if (ameth && ameth->sig_print)
return ameth->sig_print(bp, sigalg, sig, 9, 0);
- }
}
+ }
if (sig)
return X509_signature_dump(bp, sig, 9);
else if (BIO_puts(bp, "\n") <= 0)
@@ -339,7 +339,7 @@ int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
}
int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
- {
+{
int i,n;
char buf[80];
const char *p;
@@ -348,7 +348,7 @@ int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
n=0;
p=(const char *)v->data;
for (i=0; i<v->length; i++)
- {
+ {
if ((p[i] > '~') || ((p[i] < ' ') &&
(p[i] != '\n') && (p[i] != '\r')))
buf[n]='.';
@@ -356,17 +356,17 @@ int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
buf[n]=p[i];
n++;
if (n >= 80)
- {
+ {
if (BIO_write(bp,buf,n) <= 0)
return(0);
n=0;
- }
}
+ }
if (n > 0)
if (BIO_write(bp,buf,n) <= 0)
return(0);
return(1);
- }
+}
int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm)
{
@@ -384,7 +384,7 @@ static const char *mon[12]=
};
int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm)
- {
+{
char *v;
int gmt=0;
int i;
@@ -408,18 +408,18 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm)
if (tm->length >= 14 &&
(v[12] >= '0') && (v[12] <= '9') &&
(v[13] >= '0') && (v[13] <= '9'))
- {
+ {
s= (v[12]-'0')*10+(v[13]-'0');
/* Check for fractions of seconds. */
if (tm->length >= 15 && v[14] == '.')
- {
+ {
int l = tm->length;
f = &v[14]; /* The decimal point. */
f_len = 1;
while (14 + f_len < l && f[f_len] >= '0' && f[f_len] <= '9')
++f_len;
- }
}
+ }
if (BIO_printf(bp,"%s %2d %02d:%02d:%02d%.*s %d%s",
mon[M-1],d,h,m,s,f_len,f,y,(gmt)?" GMT":"") <= 0)
@@ -429,10 +429,10 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm)
err:
BIO_write(bp,"Bad time value",14);
return(0);
- }
+}
int ASN1_UTCTIME_print(BIO *bp, const ASN1_UTCTIME *tm)
- {
+{
const char *v;
int gmt=0;
int i;
@@ -465,10 +465,10 @@ int ASN1_UTCTIME_print(BIO *bp, const ASN1_UTCTIME *tm)
err:
BIO_write(bp,"Bad time value",14);
return(0);
- }
+}
int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
- {
+{
char *s,*c,*b;
int ret=0,l,i;
@@ -476,15 +476,15 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
b=X509_NAME_oneline(name,NULL,0);
if (!*b)
- {
+ {
free(b);
return 1;
- }
+ }
s=b+1; /* skip the first slash */
c=s;
for (;;)
- {
+ {
if ( ((*s == '/') &&
((s[1] >= 'A') && (s[1] <= 'Z') && (
(s[2] == '=') ||
@@ -492,27 +492,27 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
(s[3] == '='))
))) ||
(*s == '\0'))
- {
+ {
i=s-c;
if (BIO_write(bp,c,i) != i) goto err;
c=s+1; /* skip following slash */
if (*s != '\0')
- {
+ {
if (BIO_write(bp,", ",2) != 2) goto err;
- }
- l--;
}
+ l--;
+ }
if (*s == '\0') break;
s++;
l--;
- }
+ }
ret=1;
if (0)
- {
+ {
err:
X509err(X509_F_X509_NAME_PRINT,ERR_R_BUF_LIB);
- }
+ }
free(b);
return(ret);
- }
+}