ykchalresp doesn't need to depend on libykpers

diff --git a/Makefile.am b/Makefile.am
index 84eec952cfeee9f55c79995bb9791dd322568d3e..a85cba8e42cbfe50a115f114f03ce452b623aa19 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,7 @@ ykpersonalize_SOURCES = ykpersonalize.c ykpers-args.h ykpers-args.c
 ykpersonalize_LDADD = ./libykpers-1.la ./ykcore/libykcore.la
 
 ykchalresp_SOURCES = ykchalresp.c
-ykchalresp_LDADD = ./libykpers-1.la ./ykcore/libykcore.la
+ykchalresp_LDADD = ./ykcore/libykcore.la
 
 ykinfo_SOURCES = ykinfo.c
 ykinfo_LDADD = ./ykcore/libykcore.la

diff --git a/ykchalresp.c b/ykchalresp.c
index 6693d538df209e836002baee990798ea90e137dc..62fb4b01993cdc99db86d9765b0fb7e4b91839c3 100644 (file)
--- a/ykchalresp.c
+++ b/ykchalresp.c
@@ -35,9 +35,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <ykpers.h>
 #include <yubikey.h>
 #include <ykdef.h>
+#include <ykcore.h>
+#include <ykstatus.h>
 
 const char *usage =
        "Usage: ykchalresp [options] challenge\n"
@@ -60,9 +61,6 @@ const char *optstring = "12xvhHYN";
 
 static void report_yk_error(void)
 {
-       if (ykp_errno)
-               fprintf(stderr, "Yubikey personalization error: %s\n",
-                       ykp_strerror(ykp_errno));
        if (yk_errno) {
                if (yk_errno == YK_EUSBERR) {
                        fprintf(stderr, "USB error: %s\n",
@@ -241,7 +239,6 @@ int main(int argc, char **argv)
        unsigned int challenge_len;
        int slot = 1;
 
-       ykp_errno = 0;
        yk_errno = 0;
 
        if (! parse_args(argc, argv,