New function X509_signature_print() to remove some duplicate

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

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 6049909a02f4dca8f66d86e33199f4cd066de25a..5e875b2f87439f03a4a3eb2d0215d789fe44f739 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -85,8 +85,7 @@ int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
 int X509_REQ_print(BIO *bp, X509_REQ *x)
        {
        unsigned long l;
-       int i,n;
-       char *s;
+       int i;
        const char *neg;
        X509_REQ_INFO *ri;
        EVP_PKEY *pkey;
@@ -119,7 +118,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
 
        pkey=X509_REQ_get_pubkey(x);
 #ifndef NO_RSA
-       if (pkey->type == EVP_PKEY_RSA)
+       if (pkey != NULL && pkey->type == EVP_PKEY_RSA)
                {
                BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
                        BN_num_bits(pkey->pkey.rsa->n));
@@ -128,7 +127,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
        else 
 #endif
 #ifndef NO_DSA
-               if (pkey->type == EVP_PKEY_DSA)
+               if (pkey != NULL && pkey->type == EVP_PKEY_DSA)
                {
                BIO_printf(bp,"%12sDSA Public Key:\n","");
                DSA_print(bp,pkey->pkey.dsa,16);
@@ -137,20 +136,18 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
 #endif
                BIO_printf(bp,"%12sUnknown Public Key:\n","");
 
-       EVP_PKEY_free(pkey);
+       if (pkey != NULL)
+           EVP_PKEY_free(pkey);
 
        /* may not be */
        sprintf(str,"%8sAttributes:\n","");
        if (BIO_puts(bp,str) <= 0) goto err;
 
        sk=x->req_info->attributes;
-       if ((sk == NULL) || (sk_X509_ATTRIBUTE_num(sk) == 0))
+       if (sk_X509_ATTRIBUTE_num(sk) == 0)
                {
-               if (!x->req_info->req_kludge)
-                       {
-                       sprintf(str,"%12sa0:00\n","");
-                       if (BIO_puts(bp,str) <= 0) goto err;
-                       }
+               sprintf(str,"%12sa0:00\n","");
+               if (BIO_puts(bp,str) <= 0) goto err;
                }
        else
                {
@@ -169,7 +166,13 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
                        if (BIO_puts(bp,str) <= 0) goto err;
                        if ((j=i2a_ASN1_OBJECT(bp,a->object)) > 0)
                        {
-                       if (a->set)
+                       if (a->single)
+                               {
+                               t=a->value.single;
+                               type=t->type;
+                               bs=t->value.bit_string;
+                               }
+                       else
                                {
                                ii=0;
                                count=sk_ASN1_TYPE_num(a->value.set);
@@ -178,12 +181,6 @@ get_next:
                                type=at->type;
                                bs=at->value.asn1_string;
                                }
-                       else
-                               {
-                               t=a->value.single;
-                               type=t->type;
-                               bs=t->value.bit_string;
-                               }
                        }
                        for (j=25-j; j>0; j--)
                                if (BIO_write(bp," ",1) != 1) goto err;
@@ -221,31 +218,15 @@ get_next:
                                goto err;
                        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;
                }
                sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
        }
 
-       i=OBJ_obj2nid(x->sig_alg->algorithm);
-       sprintf(str,"%4sSignature Algorithm: %s","",
-               (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i));
-       if (BIO_puts(bp,str) <= 0) goto err;
+       if(!X509_signature_print(bp, x->sig_alg, x->signature)) goto err;
 
-       n=x->signature->length;
-       s=(char *)x->signature->data;
-       for (i=0; i<n; i++)
-               {
-               if ((i%18) == 0)
-                       {
-                       sprintf(str,"\n%8s","");
-                       if (BIO_puts(bp,str) <= 0) goto err;
-                       }
-               sprintf(str,"%02x%s",(unsigned char)s[i],((i+1) == n)?"":":");
-               if (BIO_puts(bp,str) <= 0) goto err;
-               }
-       if (BIO_puts(bp,"\n") <= 0) goto err;
        return(1);
 err:
        X509err(X509_F_X509_REQ_PRINT,ERR_R_BUF_LIB);