===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/signify/signify.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -c -r1.117 -r1.118
*** src/usr.bin/signify/signify.c	2016/09/03 12:21:38	1.117
--- src/usr.bin/signify/signify.c	2016/09/10 12:23:16	1.118
***************
*** 1,4 ****
! /* $OpenBSD: signify.c,v 1.117 2016/09/03 12:21:38 espie Exp $ */
  /*
   * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: signify.c,v 1.118 2016/09/10 12:23:16 deraadt Exp $ */
  /*
   * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
   *
***************
*** 450,456 ****
  	size_t len;
  	char *cmp;
  	int slen;
! 	
  	len = strlen(pubkeyfile);
  	slen = asprintf(&cmp, "-%s.pub", keytype);
  	if (slen < 0)
--- 450,456 ----
  	size_t len;
  	char *cmp;
  	int slen;
! 
  	len = strlen(pubkeyfile);
  	slen = asprintf(&cmp, "-%s.pub", keytype);
  	if (slen < 0)
***************
*** 560,566 ****
  	char algo[32];
  };
  
! static void * 
  ecalloc(size_t s1, size_t s2, void *data)
  {
  	void *p;
--- 560,566 ----
  	char algo[32];
  };
  
! static void *
  ecalloc(size_t s1, size_t s2, void *data)
  {
  	void *p;
***************
*** 691,697 ****
  }
  
  void *
! verifyzdata(uint8_t *zdata, unsigned long long zdatalen, 
      const char *filename, const char *pubkeyfile, const char *keytype)
  {
  	struct sig sig;
--- 691,697 ----
  }
  
  void *
! verifyzdata(uint8_t *zdata, unsigned long long zdatalen,
      const char *filename, const char *pubkeyfile, const char *keytype)
  {
  	struct sig sig;
***************
*** 701,707 ****
  
  	if (zdatalen < sizeof(sig))
  		errx(1, "signature too short in %s", filename);
! 	siglen = parseb64file(filename, zdata, &sig, sizeof(sig), 
  	    sigcomment);
  	readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
  	zdata += siglen;
--- 701,707 ----
  
  	if (zdatalen < sizeof(sig))
  		errx(1, "signature too short in %s", filename);
! 	siglen = parseb64file(filename, zdata, &sig, sizeof(sig),
  	    sigcomment);
  	readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
  	zdata += siglen;
***************
*** 864,870 ****
  		} else {
  			if (!msgfile)
  				usage("must specify message");
! 			verify(pubkeyfile, msgfile, sigfile, embedded, 
  			    quiet, keytype);
  		}
  		break;
--- 864,870 ----
  		} else {
  			if (!msgfile)
  				usage("must specify message");
! 			verify(pubkeyfile, msgfile, sigfile, embedded,
  			    quiet, keytype);
  		}
  		break;