Update from HEAD.

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 740cee80c0fd389bb52126664d95306ccdb17f9c..764f0674de326ea8d809c8f7be87596103d4622e 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -230,7 +230,7 @@ get_next:
                                }
                        }
                }
-       if(!(cflag & X509_FLAG_NO_ATTRIBUTES))
+       if(!(cflag & X509_FLAG_NO_EXTENSIONS))
                {
                exts = X509_REQ_get_extensions(x);
                if(exts)
@@ -248,7 +248,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);