Tolerate a SEQUENCE in DN components.

[openssl.git] / crypto / asn1 / t_x509.c

diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c
index f142f65900670998679aaf22e4912be491a1c7ff..3d25335e547117008c92ce59e3676c691284abbc 100644 (file)
--- a/crypto/asn1/t_x509.c
+++ b/crypto/asn1/t_x509.c
@@ -66,6 +66,9 @@
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
+#ifndef OPENSSL_NO_EC
+#include <openssl/ec.h>
+#endif
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
@@ -83,7 +86,7 @@ int X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cfla
 
         if ((b=BIO_new(BIO_s_file())) == NULL)
                {
-               X509err(X509_F_X509_PRINT_FP,ERR_R_BUF_LIB);
+               X509err(X509_F_X509_PRINT_EX_FP,ERR_R_BUF_LIB);
                 return(0);
                }
         BIO_set_fp(b,fp,BIO_NOCLOSE);
@@ -112,7 +115,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
 
        if((nmflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
                        mlch = '\n';
-                       nmindent = 16;
+                       nmindent = 12;
        }
 
        if(nmflags == X509_FLAG_COMPAT)
@@ -165,20 +168,23 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
 
        if(!(cflag & X509_FLAG_NO_SIGNAME))
                {
-               i=OBJ_obj2nid(ci->signature->algorithm);
-               if (BIO_printf(bp,"%8sSignature Algorithm: %s\n","",
-                       (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)) <= 0)
+               if (BIO_printf(bp,"%8sSignature Algorithm: ","") <= 0) 
+                       goto err;
+               if (i2a_ASN1_OBJECT(bp, ci->signature->algorithm) <= 0)
+                       goto err;
+               if (BIO_puts(bp, "\n") <= 0)
                        goto err;
                }
 
        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)) 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,"\n        Validity\n",18) <= 0) goto err;
+               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;
@@ -188,15 +194,19 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
        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)) 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,"\n        Subject Public Key Info:\n",34) <= 0)
+               if (BIO_write(bp,"        Subject Public Key Info:\n",33) <= 0)
+                       goto err;
+               if (BIO_printf(bp,"%12sPublic Key Algorithm: ","") <= 0)
+                       goto err;
+               if (i2a_ASN1_OBJECT(bp, ci->key->algor->algorithm) <= 0)
+                       goto err;
+               if (BIO_puts(bp, "\n") <= 0)
                        goto err;
-               i=OBJ_obj2nid(ci->key->algor->algorithm);
-               if (BIO_printf(bp,"%12sPublic Key Algorithm: %s\n","",
-                       (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)) <= 0) goto err;
 
                pkey=X509_get_pubkey(x);
                if (pkey == NULL)
@@ -221,6 +231,14 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
                        DSA_print(bp,pkey->pkey.dsa,16);
                        }
                else
+#endif
+#ifndef OPENSSL_NO_EC
+               if (pkey->type == EVP_PKEY_EC)
+                       {
+                       BIO_printf(bp, "%12sEC Public Key:\n","");
+                       EC_KEY_print(bp, pkey->pkey.ec, 16);
+                       }
+               else
 #endif
                        BIO_printf(bp,"%12sUnknown Public Key:\n","");
 
@@ -252,7 +270,6 @@ int X509_ocspid_print (BIO *bp, X509 *x)
        unsigned char *dertmp;
        int derlen;
        int i;
-       SHA_CTX SHA1buf ;
        unsigned char SHA1md[SHA_DIGEST_LENGTH];
 
        /* display the hash of the subject as it would appear
@@ -264,9 +281,7 @@ int X509_ocspid_print (BIO *bp, X509 *x)
                goto err;
        i2d_X509_NAME(x->cert_info->subject, &dertmp);
 
-       SHA1_Init(&SHA1buf);
-       SHA1_Update(&SHA1buf, der, derlen);
-       SHA1_Final(SHA1md,&SHA1buf);
+       EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL);
        for (i=0; i < SHA_DIGEST_LENGTH; i++)
                {
                if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0) goto err;
@@ -279,10 +294,8 @@ int X509_ocspid_print (BIO *bp, X509 *x)
        if (BIO_printf(bp,"\n        Public key OCSP hash: ") <= 0)
                goto err;
 
-       SHA1_Init(&SHA1buf);
-       SHA1_Update(&SHA1buf, x->cert_info->key->public_key->data,
-               x->cert_info->key->public_key->length);
-       SHA1_Final(SHA1md,&SHA1buf);
+       EVP_Digest(x->cert_info->key->public_key->data,
+               x->cert_info->key->public_key->length, SHA1md, NULL, EVP_sha1(), NULL);
        for (i=0; i < SHA_DIGEST_LENGTH; i++)
                {
                if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0)
@@ -366,6 +379,8 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, ASN1_GENERALIZEDTIME *tm)
        int gmt=0;
        int i;
        int y=0,M=0,d=0,h=0,m=0,s=0;
+       char *f = NULL;
+       int f_len = 0;
 
        i=tm->length;
        v=(char *)tm->data;
@@ -382,10 +397,21 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, ASN1_GENERALIZEDTIME *tm)
        m=  (v[10]-'0')*10+(v[11]-'0');
        if (    (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 (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 %d%s",
-               mon[M-1],d,h,m,s,y,(gmt)?" GMT":"") <= 0)
+       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)
                return(0);
        else
                return(1);
@@ -431,13 +457,17 @@ err:
 
 int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
        {
-       char *s,*c;
+       char *s,*c,*b;
        int ret=0,l,ll,i,first=1;
-       char buf[256];
 
        ll=80-2-obase;
 
-       s=X509_NAME_oneline(name,buf,256);
+       b=s=X509_NAME_oneline(name,NULL,0);
+       if (!*s)
+               {
+               OPENSSL_free(b);
+               return 1;
+               }
        s++; /* skip the first slash */
 
        l=ll;
@@ -493,6 +523,7 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
 err:
                X509err(X509_F_X509_NAME_PRINT,ERR_R_BUF_LIB);
                }
+       OPENSSL_free(b);
        return(ret);
        }