summaryrefslogtreecommitdiffstats
path: root/crypto/asn1/t_req.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-12-14 00:53:10 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-12-14 00:53:10 +0000
commitde487514aeb2a43fefe0d9c7cf697ff4f5e9be5f (patch)
tree6eec6edcb5768cebd9a5fbe144f49ffeca3348b0 /crypto/asn1/t_req.c
parent06db4253e2eb1208b60b5107c6a02d385a0e2129 (diff)
New function X509_signature_print() to remove some duplicate
code from certificate, CRL and request printing routines.
Diffstat (limited to 'crypto/asn1/t_req.c')
-rw-r--r--crypto/asn1/t_req.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index b80ea1857f..5e875b2f87 100644
--- 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;
@@ -226,24 +225,8 @@ get_next:
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);