Skip to content

Commit

Permalink
Release 0.6.1, add pivy-tool version cmd
Browse files Browse the repository at this point in the history
  • Loading branch information
arekinath committed Jul 28, 2020
1 parent bb4aa9d commit edd6fcf
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ libdir ?= $(prefix)/lib
binowner ?= root
bingroup ?= wheel

VERSION = 0.6.0
VERSION = 0.6.1

SECURITY_CFLAGS = \
-fstack-protector-all -fwrapv -fPIC \
Expand Down Expand Up @@ -194,7 +194,8 @@ PIVTOOL_CFLAGS= $(PCSC_CFLAGS) \
$(ZLIB_CFLAGS) \
$(SYSTEM_CFLAGS) \
$(SECURITY_CFLAGS) \
-O2 -g -D_GNU_SOURCE
-O2 -g -D_GNU_SOURCE \
-DPIVY_VERSION='"$(VERSION)"'
PIVTOOL_LDFLAGS= $(SYSTEM_LDFLAGS)
PIVTOOL_LIBS= $(PCSC_LIBS) \
$(CRYPTO_LIBS) \
Expand Down
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
pivy (0.6.1-1) UNRELEASED; urgency=medium

* pivy-agent: fix for parsing errors in pivy-agent -S arguments
* pivy-box: performance improvements with large numbers of configs
* pivy-agent: re-establish new PCSC context on some errors

-- Alex Wilson <[email protected]> Tue, 28 Jul 2020 07:34:33 +0000

pivy (0.6.0-1) UNRELEASED; urgency=medium

* pivy-agent support for SSH_ASKPASS, connection confirm mode
Expand Down
3 changes: 3 additions & 0 deletions pivy-tool.c
Original file line number Diff line number Diff line change
Expand Up @@ -2850,6 +2850,9 @@ main(int argc, char *argv[])
check_select_key();
err = cmd_import(slotid);

} else if (strcmp(op, "version") == 0) {
fprintf(stdout, "%s\n", PIVY_VERSION);

} else {
warnx("invalid operation '%s'", op);
usage();
Expand Down

0 comments on commit edd6fcf

Please sign in to comment.