From patchwork Thu Apr 18 21:09:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Richard W.M. Jones" X-Patchwork-Id: 237737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 065C42C0205 for ; Fri, 19 Apr 2013 07:10:04 +1000 (EST) Received: from localhost ([::1]:51189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USw5i-0004UU-6H for incoming@patchwork.ozlabs.org; Thu, 18 Apr 2013 17:10:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USw5U-0004SC-3s for qemu-devel@nongnu.org; Thu, 18 Apr 2013 17:09:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USw5T-0000fy-5H for qemu-devel@nongnu.org; Thu, 18 Apr 2013 17:09:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USw5Q-0000aU-Va; Thu, 18 Apr 2013 17:09:45 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3IL9ijA028587 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 18 Apr 2013 17:09:44 -0400 Received: from choo.home.annexia.org (vpn1-7-56.ams2.redhat.com [10.36.7.56]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3IL9gqd007137; Thu, 18 Apr 2013 17:09:43 -0400 From: "Richard W.M. Jones" To: qemu-trivial@nongnu.org Date: Thu, 18 Apr 2013 22:09:33 +0100 Message-Id: <1366319373-12926-1-git-send-email-rjones@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: sw@weilnetz.de, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] ssh: Remove unnecessary use of strlen function. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Richard W.M. Jones" Reviewed-by: Eric Blake Reviewed-by: Stefan Weil --- block/ssh.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 8f78e2e..7bc008d 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -387,15 +387,13 @@ static int check_host_key(BDRVSSHState *s, const char *host, int port, } /* host_key_check=md5:xx:yy:zz:... */ - if (strlen(host_key_check) >= 4 && - strncmp(host_key_check, "md5:", 4) == 0) { + if (strncmp(host_key_check, "md5:", 4) == 0) { return check_host_key_hash(s, &host_key_check[4], LIBSSH2_HOSTKEY_HASH_MD5, 16); } /* host_key_check=sha1:xx:yy:zz:... */ - if (strlen(host_key_check) >= 5 && - strncmp(host_key_check, "sha1:", 5) == 0) { + if (strncmp(host_key_check, "sha1:", 5) == 0) { return check_host_key_hash(s, &host_key_check[5], LIBSSH2_HOSTKEY_HASH_SHA1, 20); }