From 944e83959d61890503610b902165872a8e9f9e81 Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Fri, 10 Jan 2014 11:02:11 +0100 Subject: [PATCH] bump copyrights --- COPYING | 2 +- configure.ac | 2 +- libykpers-1.map | 2 +- tests/test_args_to_config.c | 2 +- tests/test_yk_utilities.c | 2 +- ykcore/ykcore.c | 9 +++++++-- ykcore/ykcore.h | 2 +- ykcore/ykcore_libusb-1.0.c | 2 +- ykcore/ykcore_libusb.c | 2 +- ykcore/ykcore_osx.c | 2 +- ykpers-args.c | 2 +- ykpers-args.h | 2 +- ykpers.c | 2 +- ykpers.h | 2 +- ykpersonalize.1 | 2 +- ykpersonalize.c | 2 +- 16 files changed, 22 insertions(+), 17 deletions(-) diff --git a/COPYING b/COPYING index 25a8340..ce19a79 100644 --- 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 Copyright (c) 2009 Christer Kaivo-oja Copyright (c) 2010 Simon Josefsson diff --git a/configure.ac b/configure.ac index fb3158b..26c1efb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Written by Richard Levitte . -# 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 e49d81b..ec6c6f5 100644 --- a/libykpers-1.map +++ b/libykpers-1.map @@ -1,5 +1,5 @@ # Written by Simon Josefsson . -# 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 f0c024e..3f3ddf2 100644 --- 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 8e2bf2c..02e30da 100644 --- 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 31a9460..85ff347 100644 --- 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 33d0592..9bdc9fb 100644 --- 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 2385e7f..a726fc1 100644 --- 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 * All rights reserved. * diff --git a/ykcore/ykcore_libusb.c b/ykcore/ykcore_libusb.c index 1c9c116..279db57 100644 --- 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 b9f2087..e5e6c4e 100644 --- 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 * All rights reserved. * diff --git a/ykpers-args.c b/ykpers-args.c index efbfae1..82aa165 100644 --- 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 * All rights reserved. * diff --git a/ykpers-args.h b/ykpers-args.h index 22f99f2..2f7c3e9 100644 --- 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 c46c9e8..ef52c12 100644 --- 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 8b1eabe..8476aef 100644 --- 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 3896ffe..959271b 100644 --- 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 .\" All rights reserved. .\" diff --git a/ykpersonalize.c b/ykpersonalize.c index 2bce23e..81ec96d 100644 --- 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 * All rights reserved. * -- 2.39.5