bump copyrights

diff --git a/COPYING b/COPYING
index 25a8340bf823d37676bb451931b8d50ec72c23b5..ce19a793e93703bcc4301680f3ed16266b6e8c5d 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013 Yubico AB
+Copyright (c) 2008-2014 Yubico AB
 Copyright (c) 2009-2010 Tollef Fog Heen <tfheen@err.no>
 Copyright (c) 2009 Christer Kaivo-oja <christer.kaivooja@gmail.com>
 Copyright (c) 2010 Simon Josefsson <simon@josefsson.org>

diff --git a/configure.ac b/configure.ac
index fb3158be7b6bfe4236d299fa7b89e67bd738ff49..26c1efb39f515d410232ddeeda0e965f8abaf3b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Written by Richard Levitte <richard@levitte.org>.
-# Copyright (c) 2008-2013 Yubico AB
+# Copyright (c) 2008-2014 Yubico AB
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without

diff --git a/libykpers-1.map b/libykpers-1.map
index e49d81b861310f7d8b0501def80c95992e170d4f..ec6c6f55323fcfbecd230b23c2797a0cee1255b6 100644 (file)
--- a/libykpers-1.map
+++ b/libykpers-1.map
@@ -1,5 +1,5 @@
 # Written by Simon Josefsson <simon@yubico.com>.
-# Copyright (c) 2008-2013 Yubico AB
+# Copyright (c) 2008-2014 Yubico AB
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without

diff --git a/tests/test_args_to_config.c b/tests/test_args_to_config.c
index f0c024e9a15cc3923202a29ca4c17eab5a2967af..3f3ddf2a3ae9f3dff76f9959cbafd305bcf4fdd5 100644 (file)
--- a/tests/test_args_to_config.c
+++ b/tests/test_args_to_config.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2011-2013 Yubico AB
+ * Copyright (c) 2011-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/tests/test_yk_utilities.c b/tests/test_yk_utilities.c
index 8e2bf2cdc24766800b0609519e01d9770e7713ff..02e30da70acf674ad1e1b7f8d9882bfc19a14dc6 100644 (file)
--- a/tests/test_yk_utilities.c
+++ b/tests/test_yk_utilities.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2012-2013 Yubico AB
+ * Copyright (c) 2012-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ykcore/ykcore.c b/ykcore/ykcore.c
index 31a9460cc82f4a77e26308b56d304d38077dc02d..85ff34710e6a4f2791f1e1a33b48f54244daacd7 100644 (file)
--- a/ykcore/ykcore.c
+++ b/ykcore/ykcore.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2013 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -482,8 +482,13 @@ int yk_wait_for_key_status(YK_KEY *yk, uint8_t slot, unsigned int flags,
 
                /* Read a status report from the key */
                memset(data, 0, sizeof(data));
-               if (!_ykusb_read(yk, REPORT_TYPE_FEATURE, slot, (char *) &data, FEATURE_RPT_SIZE))
+               if (!_ykusb_read(yk, REPORT_TYPE_FEATURE, slot, (char *) &data, FEATURE_RPT_SIZE)) {
+                       if(yk_errno == YK_ENODATA) {
+                               yk_errno = 0;
+                               continue;
+                       }
                        return 0;
+               }
 
                if (last_data != NULL)
                        memcpy(last_data, data, sizeof(data));

diff --git a/ykcore/ykcore.h b/ykcore/ykcore.h
index 33d0592581a394b963e0e1a3941e1e89e7f9b279..9bdc9fbcbdb76dbdbb220aab1524bf9c59b7decd 100644 (file)
--- a/ykcore/ykcore.h
+++ b/ykcore/ykcore.h
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2012 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ykcore/ykcore_libusb-1.0.c b/ykcore/ykcore_libusb-1.0.c
index 2385e7fa67b52811d88882ae6bee68c4ddf98132..a726fc18d3d6aadbdc83018b4f38032543c8bfc1 100644 (file)
--- a/ykcore/ykcore_libusb-1.0.c
+++ b/ykcore/ykcore_libusb-1.0.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2013 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * Copyright (c) 2009 Tollef Fog Heen <tfheen@err.no>
  * All rights reserved.
  *

diff --git a/ykcore/ykcore_libusb.c b/ykcore/ykcore_libusb.c
index 1c9c116bb3b73289204a2d6330414c3edf8ccc85..279db573809bedd4245bd0a475e7ce1507731334 100644 (file)
--- a/ykcore/ykcore_libusb.c
+++ b/ykcore/ykcore_libusb.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2012 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ykcore/ykcore_osx.c b/ykcore/ykcore_osx.c
index b9f2087595b9478036c9587041d35272f814a2f5..e5e6c4e0bdf9ce3679d843daa83c414589c9dea3 100644 (file)
--- a/ykcore/ykcore_osx.c
+++ b/ykcore/ykcore_osx.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2012 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * Copyright (c) 2009 Christer Kaivo-oja <christer.kaivooja@gmail.com>
  * All rights reserved.
  *

diff --git a/ykpers-args.c b/ykpers-args.c
index efbfae1046aa1e08f02d62247c2075546a2572aa..82aa165336c2de9534ff9f9ac43c742aac02db67 100644 (file)
--- a/ykpers-args.c
+++ b/ykpers-args.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2013 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * Copyright (c) 2010 Tollef Fog Heen <tfheen@err.no>
  * All rights reserved.
  *

diff --git a/ykpers-args.h b/ykpers-args.h
index 22f99f2655da85032f001d407b0a74f6209fdcaa..2f7c3e959491cdbaa8df300bfdf35d1e679934c5 100644 (file)
--- a/ykpers-args.h
+++ b/ykpers-args.h
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2012 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ykpers.c b/ykpers.c
index c46c9e80dabbff6d48563ac5c6399139761012a8..ef52c12748caf18061a2be2f89970b991cca0ed5 100644 (file)
--- a/ykpers.c
+++ b/ykpers.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2013 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ykpers.h b/ykpers.h
index 8b1eabe4a61312245c5ec0a5a810e83b51219731..8476aef07b3f660bcf39017f42af807931fbcec8 100644 (file)
--- a/ykpers.h
+++ b/ykpers.h
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2013 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ykpersonalize.1 b/ykpersonalize.1
index 3896ffe98a06c729fe9814fc50ef9ad76bd03f99..959271b565df877113829541ca015b110c80d20a 100644 (file)
--- a/ykpersonalize.1
+++ b/ykpersonalize.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2009-2013 Yubico AB
+.\" Copyright (c) 2009-2014 Yubico AB
 .\" Copyright (C) 2009, 2010 Tollef Fog Heen <tfheen@err.no>
 .\" All rights reserved.
 .\"

diff --git a/ykpersonalize.c b/ykpersonalize.c
index 2bce23e1a217190f9d8bec257c5575aaa9f44523..81ec96db8bf49dad148a59191b48d9feac8917da 100644 (file)
--- a/ykpersonalize.c
+++ b/ykpersonalize.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: "bsd" -*- */
 /*
- * Copyright (c) 2008-2013 Yubico AB
+ * Copyright (c) 2008-2014 Yubico AB
  * Copyright (c) 2010 Tollef Fog Heen <tfheen@err.no>
  * All rights reserved.
  *