Klas Lindfors b770155cbb Merge branch 'devel/p384' into ykcs11 ...

Conflicts:
	NEWS
	configure.ac
	lib/ykpiv.c
	lib/ykpiv.h
	tool/util.c
	tool/util.h

2015-09-07 14:32:37 +02:00

..

tests

relicense to 2-clause BSD license

2015-07-01 16:34:20 +02:00

cmdline.ggo

Merge branch 'master' into devel/p384

2015-07-08 15:09:11 +02:00

Makefile.am

relicense to 2-clause BSD license

2015-07-01 16:34:20 +02:00

util.c

Merge branch 'devel/p384' into ykcs11

2015-09-07 14:32:37 +02:00

util.h

Merge branch 'devel/p384' into ykcs11

2015-09-07 14:32:37 +02:00

yubico-piv-tool.adoc

remove extra \

2015-07-03 13:28:12 +02:00

yubico-piv-tool.c

Merge branch 'devel/p384' into ykcs11

2015-09-07 14:32:37 +02:00

yubico-piv-tool.h2m

relicense to 2-clause BSD license

2015-07-01 16:34:20 +02:00