From f63c927e8e47f46f52f84d5935daf0122bd2d9a5 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Thu, 12 Jan 2012 16:36:30 +0000
Subject: asn1/t_x509.c: fix serial number print, harmonize with a_int.c [from
 HEAD]. PR: 2675 Submitted by: Annie Yousar

---
 crypto/asn1/a_int.c  | 4 ++--
 crypto/asn1/t_x509.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'crypto/asn1')

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 3348b8762c..ad0d2506f6 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -386,8 +386,8 @@ long ASN1_INTEGER_get(const ASN1_INTEGER *a)
 	
 	if (a->length > (int)sizeof(long))
 		{
-		/* hmm... a bit ugly */
-		return(0xffffffffL);
+		/* hmm... a bit ugly, return all ones */
+		return -1;
 		}
 	if (a->data == NULL)
 		return 0;
diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c
index e061f2ffad..89e7a7f546 100644
--- a/crypto/asn1/t_x509.c
+++ b/crypto/asn1/t_x509.c
@@ -140,7 +140,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
 		if (bs->length <= 4)
 			{
 			l=ASN1_INTEGER_get(bs);
-			if (l < 0)
+			if (bs->type == V_ASN1_NEG_INTEGER)
 				{
 				l= -l;
 				neg="-";
-- 
cgit v1.2.3