From: Matt Caswell <matt@openssl.org>
Date: Tue, 17 May 2016 10:07:27 +0000 (+0100)
Subject: Remove repeated condition from if in X509_NAME_oneline
X-Git-Tag: OpenSSL_1_0_2i~195
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=57f115e9088fafdc8a65bdf709e9154dded4ab10;p=oweals%2Fopenssl.git

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@openssl.org>
(cherry picked from commit 2647e2617e31002cb0ab80758be4e566917d2888)
---

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 3de3ac7204..0a839f3e54 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);