From: Fredrik Thulin <fredrik@yubico.com>
Date: Mon, 7 Mar 2011 13:57:42 +0000 (+0100)
Subject: Wait for configuration writing to finish.
X-Git-Tag: v1.5.0~8^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=266a585d861b0912785e8b3556b84db497b644be;p=yubikey-personalization.old

Wait for configuration writing to finish.

After last write, we must wait for the key to turn off SLOT_WRITE_FLAG
before fetching status to verify write operation.
---

diff --git a/ykcore/ykcore.c b/ykcore/ykcore.c
index 7447009..e74e0fe 100644
--- a/ykcore/ykcore.c
+++ b/ykcore/ykcore.c
@@ -41,6 +41,17 @@
 #define Sleep(x) usleep((x)*1000)
 #endif
 
+/*
+ * Yubikey low-level interface section 2.4 (Report arbitration polling) specifies
+ * a 600 ms timeout for a Yubikey to process something written to it.
+ */
+#define WAIT_FOR_WRITE_FLAG	600
+
+int yk_wait_for_key_status(YK_KEY *yk, uint8_t slot, unsigned int flags,
+			   unsigned int max_time_ms,
+			   bool logic_and, unsigned char mask,
+			   unsigned char *last_data);
+
 int yk_init(void)
 {
 	return _ykusb_start();
@@ -121,6 +132,7 @@ int yk_write_config(YK_KEY *yk, YK_CONFIG *cfg, int confnum,
 	unsigned char buf[sizeof(YK_CONFIG) + ACC_CODE_SIZE];
 	YK_STATUS stat;
 	int seq;
+	uint8_t slot;
 
 	/* Get current sequence # from status block */
 
@@ -149,15 +161,24 @@ int yk_write_config(YK_KEY *yk, YK_CONFIG *cfg, int confnum,
 
 	switch(confnum) {
 	case 1:
-		if (!yk_write_to_key(yk, SLOT_CONFIG, buf, sizeof(buf)))
-			return 0;
+		slot = SLOT_CONFIG;
 		break;
 	case 2:
-		if (!yk_write_to_key(yk, SLOT_CONFIG2, buf, sizeof(buf)))
-			return 0;
+		slot = SLOT_CONFIG2;
 		break;
 	}
 
+	if (!yk_write_to_key(yk, slot, buf, sizeof(buf)))
+		return 0;
+
+	/* When the Yubikey clears the SLOT_WRITE_FLAG, it has processed the last write.
+	 * This wait can't be done in yk_write_to_key since some users of that function
+	 * want to get the bytes in the status message, but when writing configuration
+	 * we don't expect any data back.
+	 *
+	 */
+	yk_wait_for_key_status(yk, slot, 0, WAIT_FOR_WRITE_FLAG, false, SLOT_WRITE_FLAG, NULL);
+
 	/* Verify update */
 
 	if (!yk_get_status(yk, &stat /*, 0*/))
@@ -454,11 +475,10 @@ int yk_write_to_key(YK_KEY *yk, uint8_t slot, const void *buf, int bufcount)
 		repbuf[i] = seq | SLOT_WRITE_FLAG;
 
 		/* When the Yubikey clears the SLOT_WRITE_FLAG, the
-		 * next part can be sent. Yubikey low-level interface
-		 * section 2.4 (Report arbitration polling) specifies
-		 * a 600 ms timeout for this operation.
+		 * next part can be sent.
 		 */
-		if (! yk_wait_for_key_status(yk, slot, 0, 600, false, SLOT_WRITE_FLAG, NULL))
+		if (! yk_wait_for_key_status(yk, slot, 0, WAIT_FOR_WRITE_FLAG,
+					     false, SLOT_WRITE_FLAG, NULL))
 			return 0;
 
 		if (!_ykusb_write(yk, REPORT_TYPE_FEATURE, 0,