resolve conflicts

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
index e4c682fc44..2faf92514a 100644
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ b/src/lib/libcrypto/x509/x509_cmp.c
@@ -288,7 +288,8 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b)
                         if (!(nabit & STR_TYPE_CMP) ||
                                 !(nbbit & STR_TYPE_CMP))
                                 return j;
-                        j = asn1_string_memcmp(na->value, nb->value);
+                        if (!asn1_string_memcmp(na->value, nb->value))
+                                j = 0;
                         }
                 else if (na->value->type == V_ASN1_PRINTABLESTRING)
                         j=nocase_spacenorm_cmp(na->value, nb->value);