===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/signify/signify.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/usr.bin/signify/signify.c	2017/04/18 02:20:50	1.127
--- src/usr.bin/signify/signify.c	2017/07/11 23:27:13	1.128
***************
*** 1,4 ****
! /* $OpenBSD: signify.c,v 1.127 2017/04/18 02:20:50 deraadt Exp $ */
  /*
   * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: signify.c,v 1.128 2017/07/11 23:27:13 tedu Exp $ */
  /*
   * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
   *
***************
*** 346,358 ****
  check_keyname_compliance(const char *pubkeyfile, const char *seckeyfile)
  {
  	const char *pos;
  
  	/* basename may or may not modify input */
  	pos = strrchr(seckeyfile, '/');
  	if (pos != NULL)
! 		seckeyfile = pos+1;
  
- 	size_t len;
  	len = strlen(seckeyfile);
  	if (len < 5) /* ?.key */
  		goto bad;
--- 346,358 ----
  check_keyname_compliance(const char *pubkeyfile, const char *seckeyfile)
  {
  	const char *pos;
+ 	size_t len;
  
  	/* basename may or may not modify input */
  	pos = strrchr(seckeyfile, '/');
  	if (pos != NULL)
! 		seckeyfile = pos + 1;
  
  	len = strlen(seckeyfile);
  	if (len < 5) /* ?.key */
  		goto bad;
***************
*** 361,367 ****
  	if (pubkeyfile != NULL) {
  		pos = strrchr(pubkeyfile, '/');
  		if (pos != NULL)
! 			pubkeyfile = pos+1;
  
  		if (strlen(pubkeyfile) != len)
  			goto bad;
--- 361,367 ----
  	if (pubkeyfile != NULL) {
  		pos = strrchr(pubkeyfile, '/');
  		if (pos != NULL)
! 			pubkeyfile = pos + 1;
  
  		if (strlen(pubkeyfile) != len)
  			goto bad;