===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/skeyinit/skeyinit.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -c -r1.52 -r1.53
*** src/usr.bin/skeyinit/skeyinit.c	2013/11/28 18:24:55	1.52
--- src/usr.bin/skeyinit/skeyinit.c	2014/03/20 20:39:13	1.53
***************
*** 1,4 ****
! /*	$OpenBSD: skeyinit.c,v 1.52 2013/11/28 18:24:55 deraadt Exp $	*/
  
  /* OpenBSD S/Key (skeyinit.c)
   *
--- 1,4 ----
! /*	$OpenBSD: skeyinit.c,v 1.53 2014/03/20 20:39:13 naddy Exp $	*/
  
  /* OpenBSD S/Key (skeyinit.c)
   *
***************
*** 513,524 ****
  			continue;
  		if ((cp = strtok(NULL, " \t")) == NULL)
  			continue;
! 		if (isalpha((unsigned char)*cp)) {
! 			hashtype = cp;
! 			if ((cp = strtok(NULL, " \t")) == NULL)
! 				continue;
! 		} else
! 			hashtype = "md4";
  		n = atoi(cp);
  		if ((seed = strtok(NULL, " \t")) == NULL)
  			continue;
--- 513,523 ----
  			continue;
  		if ((cp = strtok(NULL, " \t")) == NULL)
  			continue;
! 		if (!isalpha((unsigned char)*cp))
! 			continue;
! 		hashtype = cp;
! 		if ((cp = strtok(NULL, " \t")) == NULL)
! 			continue;
  		n = atoi(cp);
  		if ((seed = strtok(NULL, " \t")) == NULL)
  			continue;
***************
*** 559,564 ****
  	extern char *__progname;
  
  	(void)fprintf(stderr, "usage: %s [-CDErsx] [-a auth-type] [-n count]"
! 	    "\n\t[-md4 | -md5 | -rmd160 | -sha1] [user]\n", __progname);
  	exit(1);
  }
--- 558,563 ----
  	extern char *__progname;
  
  	(void)fprintf(stderr, "usage: %s [-CDErsx] [-a auth-type] [-n count]"
! 	    "\n\t[-md5 | -rmd160 | -sha1] [user]\n", __progname);
  	exit(1);
  }