From b09eb246e2385ff629e365043290bbb485e99588 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 26 Aug 2014 22:31:11 -0400 Subject: [PATCH] RT3246: req command prints version number wrong Make X509_REQ_print_ex do the same thing that X509_REQ_print does. Reviewed-by: Matt Caswell --- crypto/asn1/t_req.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index ea1794e3e0..45348a7381 100644 --- a/crypto/asn1/t_req.c +++ b/crypto/asn1/t_req.c @@ -90,7 +90,7 @@ int X509_REQ_print_fp(FILE *fp, X509_REQ *x) int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long cflag) { - unsigned long l; + long l; int i; const char *neg; X509_REQ_INFO *ri; @@ -117,12 +117,8 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long } if(!(cflag & X509_FLAG_NO_VERSION)) { - neg=(ri->version->type == V_ASN1_NEG_INTEGER)?"-":""; - l=0; - for (i=0; iversion->length; i++) - { l<<=8; l+=ri->version->data[i]; } - if(BIO_printf(bp,"%8sVersion: %s%lu (%s0x%lx)\n","",neg,l,neg, - l) <= 0) + l = X509_REQ_get_version(x); + if(BIO_printf(bp,"%8sVersion: %ld (0x%lx)\n","",l+1, l) <= 0) goto err; } if(!(cflag & X509_FLAG_NO_SUBJECT)) -- 2.25.1