[Ipmitool-cvs] ipmitool/lib ipmi_channel.c,1.19,1.20

[Jeremy E. <zol...@us...>]

Update of /cvsroot/ipmitool/ipmitool/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15720/lib

Modified Files:
	ipmi_channel.c 
Log Message:
A clarification (E347) in the IPMI v2 errata document (mark II) makes it
pretty clear that listing algorithms by cipher suite does not list all
algorithms, but lists supported algothms *grouped* by cipher suite.  Since
both views contain the same information, we will just support one in 
ipmitool -- supported algorithms listed by cipher suite view.


Index: ipmi_channel.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_channel.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ipmi_channel.c	17 Mar 2005 03:28:52 -0000	1.19
--- ipmi_channel.c	22 Jun 2005 22:12:59 -0000	1.20
***************
*** 1,3 ****
! /*
   * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
   * 
--- 1,3 ----
! /* -*-mode: C; indent-tabs-mode: t; -*-
   * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
   * 
***************
*** 545,549 ****
  static int
  ipmi_get_channel_cipher_suites(struct ipmi_intf * intf,
- 			       const char * which,
  			       const char * payload_type,
  			       uint8_t channel)
--- 545,548 ----
***************
*** 572,576 ****
  	rqdata[0] = channel;
  	rqdata[1] = ((strncmp(payload_type, "ipmi", 4) == 0)? 0: 1);
! 	rqdata[2] = ((strncmp(which, "all", 3) == 0)? 0x80: 0);
  
  	rsp = intf->sendrecv(intf, &req);
--- 571,575 ----
  	rqdata[0] = channel;
  	rqdata[1] = ((strncmp(payload_type, "ipmi", 4) == 0)? 0: 1);
! 	rqdata[2] = 0x80; // Always ask for cipher suite format
  
  	rsp = intf->sendrecv(intf, &req);
***************
*** 772,776 ****
  		"<user id> [callin=on|off] [ipmi=on|off] [link=on|off] [privilege=level]");
  	lprintf(LOG_NOTICE, "                  info      [channel number]");
! 	lprintf(LOG_NOTICE, "                  getciphers <all | supported> <ipmi | sol> [channel]\n");
  	lprintf(LOG_NOTICE, "Possible privilege levels are:");
  	lprintf(LOG_NOTICE, "   1   Callback level");
--- 771,775 ----
  		"<user id> [callin=on|off] [ipmi=on|off] [link=on|off] [privilege=level]");
  	lprintf(LOG_NOTICE, "                  info      [channel number]");
! 	lprintf(LOG_NOTICE, "                  getciphers <ipmi | sol> [channel]\n");
  	lprintf(LOG_NOTICE, "Possible privilege levels are:");
  	lprintf(LOG_NOTICE, "   1   Callback level");
***************
*** 829,838 ****
  	}
  
! 	// it channel getciphers <all | supported> <ipmi | sol> [channel] 
  	else if (strncmp(argv[0], "getciphers", 10) == 0)
  	{
! 		if ((argc < 3) || (argc > 4)                                         ||
! 		    (strncmp(argv[1], "all", 3) && strncmp(argv[1], "supported", 9)) ||
! 		    (strncmp(argv[2], "ipmi", 4) && strncmp(argv[2], "sol",  3)))
  			printf_channel_usage();
  		else
--- 828,836 ----
  	}
  
! 	// it channel getciphers <ipmi | sol> [channel] 
  	else if (strncmp(argv[0], "getciphers", 10) == 0)
  	{
! 		if ((argc < 2) || (argc > 3)  ||
! 		    (strncmp(argv[1], "ipmi", 4) && strncmp(argv[1], "sol",  3)))
  			printf_channel_usage();
  		else
***************
*** 840,847 ****
  			uint8_t ch = 0xe;
  			if (argc == 4)
! 				ch = (uint8_t)strtol(argv[3], NULL, 0);
  			retval = ipmi_get_channel_cipher_suites(intf,
! 								argv[1], // all | supported
! 								argv[2], // ipmi | sol
  								ch);
  		}
--- 838,844 ----
  			uint8_t ch = 0xe;
  			if (argc == 4)
! 				ch = (uint8_t)strtol(argv[2], NULL, 0);
  			retval = ipmi_get_channel_cipher_suites(intf,
! 								argv[1], // ipmi | sol
  								ch);
  		}