From patchwork Mon Mar 25 14:23:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ward X-Patchwork-Id: 230727 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8902B2C00A5 for ; Tue, 26 Mar 2013 01:23:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758353Ab3CYOXp (ORCPT ); Mon, 25 Mar 2013 10:23:45 -0400 Received: from MX2.LL.MIT.EDU ([129.55.12.46]:42072 "EHLO mx2.ll.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758242Ab3CYOX3 (ORCPT ); Mon, 25 Mar 2013 10:23:29 -0400 Received: from LLE2K7-HUB01.mitll.ad.local (LLE2K7-HUB01.mitll.ad.local) by mx2.ll.mit.edu (unknown) with ESMTP id r2PEN2cv023593 for ; Mon, 25 Mar 2013 10:23:28 -0400 From: David Ward To: CC: David Ward Subject: [PATCH iproute2 4/7] ip/xfrm: Do not print a zero-length algorithm key Date: Mon, 25 Mar 2013 10:23:16 -0400 Message-ID: <1364221399-1024-4-git-send-email-david.ward@ll.mit.edu> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1364221399-1024-1-git-send-email-david.ward@ll.mit.edu> References: <1364221399-1024-1-git-send-email-david.ward@ll.mit.edu> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8626, 1.0.431, 0.0.0000 definitions=2013-03-25_03:2013-03-25, 2013-03-25, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=4 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1211240000 definitions=main-1303250108 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: David Ward --- ip/ipxfrm.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index 2576938..3113573 100644 --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c @@ -536,12 +536,14 @@ static void __xfrm_algo_print(struct xfrm_algo *algo, int type, int len, goto fin; } - fprintf(fp, "0x"); - for (i = 0; i < keylen; i ++) - fprintf(fp, "%.2x", (unsigned char)algo->alg_key[i]); + if (keylen > 0) { + fprintf(fp, "0x"); + for (i = 0; i < keylen; i ++) + fprintf(fp, "%.2x", (unsigned char)algo->alg_key[i]); - if (show_stats > 0) - fprintf(fp, " (%d bits)", algo->alg_key_len); + if (show_stats > 0) + fprintf(fp, " (%d bits)", algo->alg_key_len); + } fin: if (newline)