From: Pauli <paul.dale@oracle.com>
Date: Thu, 14 Sep 2017 23:05:43 +0000 (+1000)
Subject: Avoid signed vs unsigned comparison error.
X-Git-Tag: OpenSSL_1_1_1-pre1~652
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=53a73768a7f17dba012615ea79960d724b310856;hp=44589b5d44217aacbceff08f8317c2a0a4e0ff40

Avoid signed vs unsigned comparison error.
Introduced by #4372

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4374)
---

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 03492acb0f..b83a473017 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -150,7 +150,8 @@ static void free_dir(X509_LOOKUP *lu)
 
 static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
 {
-    int j, len;
+    int j;
+    size_t len;
     const char *s, *ss, *p;
 
     if (dir == NULL || !*dir) {
@@ -165,7 +166,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
             BY_DIR_ENTRY *ent;
             ss = s;
             s = p + 1;
-            len = (int)(p - ss);
+            len = p - ss;
             if (len == 0)
                 continue;
             for (j = 0; j < sk_BY_DIR_ENTRY_num(ctx->dirs); j++) {