Merge remote-tracking branch 'Yubico/master'

trustcrypto · Feb 27, 2019 · 07b47c5 · 07b47c5
2 parents 8ca5048 + 29dafc4
commit 07b47c5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,10 @@
 Yubikey-personalize NEWS -- History of user-visible changes.     -*- outline -*-
 
-* Version 1.19.3 (unreleased)
+* Version 1.19.4 (unreleased)
+
+* Version 1.19.3 (released 2019-02-22)
+
+** Fix capability read.
 
 * Version 1.19.2 (released 2019-02-19)
 

diff --git a/configure.ac b/configure.ac
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-AC_INIT([yubikey-personalization], [1.19.3],
+AC_INIT([yubikey-personalization], [1.19.4],
   [[email protected]], [ykpers],
   [https://developers.yubico.com/yubikey-personalization/])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -37,7 +37,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 20)
-AC_SUBST(LT_REVISION,3)
+AC_SUBST(LT_REVISION,4)
 AC_SUBST(LT_AGE, 19)
 
 AM_INIT_AUTOMAKE([1.11.3 -Wall -Werror])

diff --git a/ykcore/ykcore.c b/ykcore/ykcore.c
@@ -628,16 +628,16 @@ int yk_read_response_from_key(YK_KEY *yk, uint8_t slot, unsigned int flags,
 						yk_errno = YK_ECHECKSUM;
 						return 0;
 					}
-				}
 
-				/* since we get data in chunks of 7 we need to round expect bytes out to the closest higher multiple of 7 */
-				if(expect_bytes % 7 != 0) {
-					expect_bytes += 7 - (expect_bytes % 7);
-				}
+					/* since we get data in chunks of 7 we need to round expect bytes out to the closest higher multiple of 7 */
+					if(expect_bytes % 7 != 0) {
+						expect_bytes += 7 - (expect_bytes % 7);
+					}
 
-				if (*bytes_read != expect_bytes) {
-					yk_errno = YK_EWRONGSIZ;
-					return 0;
+					if (*bytes_read != expect_bytes) {
+						yk_errno = YK_EWRONGSIZ;
+						return 0;
+					}
 				}
 
 				/* Reset read mode of Yubikey before returning. */

diff --git a/ykpers4win.mk b/ykpers4win.mk
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 LIBYUBIKEYVERSION=1.13
-LIBJSONVERSION=0.13.1
+LIBJSONVERSION=0.11
 PROJECT=yubikey-personalization
 PACKAGE=ykpers
 
@@ -50,7 +50,7 @@ ykpers4win:
 		||	wget --no-check-certificate https://s3.amazonaws.com/json-c_releases/releases/json-c-$(LIBJSONVERSION).tar.gz && \
 	tar xfa json-c-$(LIBJSONVERSION).tar.gz && \
 	cd json-c-$(LIBJSONVERSION) && \
-	CC="$(HOST)-gcc -static-libgcc" ac_cv_func_realloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
+	CFLAGS="-Wno-error" ac_cv_func_realloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
 	make install && \
 	cp COPYING $(PWD)/tmp/root/licenses/json-c.txt && \
 	cd .. && \