From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 18 Feb 2007 18:21:57 +0000 (+0000)
Subject: Updates from 0.9.8-stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~971
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d5ca32fa1b34de7b7c869e9860929d033f9ffd7;p=oweals%2Fopenssl.git

Updates from 0.9.8-stable branch.
---

diff --git a/apps/dgst.c b/apps/dgst.c
index 2e7b0792d8..5d82cb2e65 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -493,7 +493,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 	else 
 		{
 		BIO_write(out,title,strlen(title));
-		for (i=0; i<len; i++)
+		for (i=0; i<(int)len; i++)
 			{
 			if (sep && (i != 0))
 				BIO_printf(out, ":");
diff --git a/apps/s_client.c b/apps/s_client.c
index d337081748..58e317a1a2 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -354,7 +354,7 @@ enum
 	PROTO_SMTP,
 	PROTO_POP3,
 	PROTO_IMAP,
-	PROTO_FTP,
+	PROTO_FTP
 };
 
 int MAIN(int, char **);
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index f02168ab92..a368adecec 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -230,7 +230,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
 			for (j=0; j < sk_BY_DIR_ENTRY_num(ctx->dirs); j++)
 				{
 				ent = sk_BY_DIR_ENTRY_value(ctx->dirs, j);
-				if (strlen(ent->dir) == len &&
+				if (strlen(ent->dir) == (size_t)len &&
 				    strncmp(ent->dir,ss,(unsigned int)len) == 0)
 					break;
 				}