[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  fbff671659bd51a7b124065ea6caf5b554111211 (commit)
      from  69d86ef1908b9f153fb32ed39eaee52011a96797 (commit)


- Log -----------------------------------------------------------------
commit fbff671659bd51a7b124065ea6caf5b554111211
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Fri Mar 4 10:34:47 2016 +0300

    GH784: Better variable name
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/t_req.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c
index a0ddd0e..2c519f9 100644
--- a/crypto/x509/t_req.c
+++ b/crypto/x509/t_req.c
@@ -205,14 +205,14 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
             for (i = 0; i < sk_X509_EXTENSION_num(exts); i++) {
                 ASN1_OBJECT *obj;
                 X509_EXTENSION *ex;
-                int j;
+                int critical;
                 ex = sk_X509_EXTENSION_value(exts, i);
                 if (BIO_printf(bp, "%12s", "") <= 0)
                     goto err;
                 obj = X509_EXTENSION_get_object(ex);
                 i2a_ASN1_OBJECT(bp, obj);
-                j = X509_EXTENSION_get_critical(ex);
-                if (BIO_printf(bp, ": %s\n", j ? "critical" : "") <= 0)
+                critical = X509_EXTENSION_get_critical(ex);
+                if (BIO_printf(bp, ": %s\n", critical ? "critical" : "") <= 0)
                     goto err;
                 if (!X509V3_EXT_print(bp, ex, cflag, 16)) {
                     BIO_printf(bp, "%16s", "");