[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2647e2617e31002cb0ab80758be4e566917d2888 (commit)
      from  c0e32b16099e346c3289932a6494c5fc902429d1 (commit)


- Log -----------------------------------------------------------------
commit 2647e2617e31002cb0ab80758be4e566917d2888
Author: Matt Caswell <matt at openssl.org>
Date:   Tue May 17 11:07:27 2016 +0100

    Remove repeated condition from if in X509_NAME_oneline
    
    An if checks the value of |type| to see if it is V_ASN1_VISIBLESTRING
    twice. We only need to do it once.
    
    GitHub Issue #656
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/x509/x509_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index eaa03f2..1297307 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -129,7 +129,7 @@ char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
             type == V_ASN1_VISIBLESTRING ||
             type == V_ASN1_PRINTABLESTRING ||
             type == V_ASN1_TELETEXSTRING ||
-            type == V_ASN1_VISIBLESTRING || type == V_ASN1_IA5STRING) {
+            type == V_ASN1_IA5STRING) {
             if (num > (int)sizeof(ebcdic_buf))
                 num = sizeof(ebcdic_buf);
             ascii2ebcdic(ebcdic_buf, q, num);