From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 22 May 2007 23:33:08 +0000 (+0000)
Subject: Update from HEAD.
X-Git-Tag: OpenSSL_0_9_8f~104
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d9a9aa027d2519e4a63fbc43f4b53b6d415ea23d;p=oweals%2Fopenssl.git

Update from HEAD.
---

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index c779a9bb18..5557e06584 100644
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -244,7 +244,7 @@ get_next:
 				}
 			}
 		}
-	if(!(cflag & X509_FLAG_NO_ATTRIBUTES))
+	if(!(cflag & X509_FLAG_NO_EXTENSIONS))
 		{
 		exts = X509_REQ_get_extensions(x);
 		if(exts)
@@ -262,7 +262,7 @@ get_next:
 				j=X509_EXTENSION_get_critical(ex);
 				if (BIO_printf(bp,": %s\n",j?"critical":"") <= 0)
 					goto err;
-				if(!X509V3_EXT_print(bp, ex, 0, 16))
+				if(!X509V3_EXT_print(bp, ex, cflag, 16))
 					{
 					BIO_printf(bp, "%16s", "");
 					M_ASN1_OCTET_STRING_print(bp,ex->value);