ECCX08 monotonic counter feature

  - rename keyId to counterId
  - add counterId value check
  - split functions to keep library style

Author: pennam

src/ECCX08.cpp

@@ -548,51 +548,77 @@ int ECCX08Class::nonce(const byte data[])
   return challenge(data);
 }
 
-long ECCX08Class::incrementCounter(int keyId)
+int ECCX08Class::incrementCounter(int counterId, long& counter)
 {
-  uint32_t counter;  // the counter can go up to 2,097,151
+  if (counterId < 0 || counterId > 1) {
+    return 0;
+  }
 
   if (!wakeup()) {
-    return -1;
+    return 0;
   }
 
-  if (!sendCommand(0x24, 1, keyId)) {
-    return -1;
+  if (!sendCommand(0x24, 1, counterId)) {
+    return 0;
   }
 
   delay(20);
 
   if (!receiveResponse(&counter, sizeof(counter))) {
-    return -1;
+    return 0;
   }
 
   delay(1);
   idle();
 
+  return 1;
+}
+
+long ECCX08Class::incrementCounter(int counterId)
+{
+  long counter;  // the counter can go up to 2,097,151
+
+  if(!incrementCounter(counterId, counter)) {
+    return -1;
+  }
+
   return counter;
 }
 
-long ECCX08Class::readCounter(int keyId)
+int ECCX08Class::readCounter(int counterId, long& counter)
 {
-  uint32_t counter;  // the counter can go up to 2,097,151
+  if (counterId < 0 || counterId > 1) {
+    return 0;
+  }
 
   if (!wakeup()) {
-    return -1;
+    return 0;
   }
 
-  if (!sendCommand(0x24, 0, keyId)) {
-    return -1;
+  if (!sendCommand(0x24, 0, counterId)) {
+    return 0;
   }
 
   delay(20);
 
   if (!receiveResponse(&counter, sizeof(counter))) {
-    return -1;
+    return 0;
   }
 
   delay(1);
   idle();
 
+  return 1;
+}
+
+long ECCX08Class::readCounter(int counterId)
+{
+  long counter;  // the counter can go up to 2,097,151
+
+  if(!readCounter(counterId, counter)) {
+    return -1;
+  }
+
   return counter;
 }
 

src/ECCX08.h

@@ -66,8 +66,10 @@ class ECCX08Class
 
   int nonce(const byte data[]);
 
-  long incrementCounter(int keyId);
-  long readCounter(int keyId);
+  int incrementCounter(int counterId, long& counter);
+  long incrementCounter(int counterId);
+  int readCounter(int counterId, long& counter);
+  long readCounter(int counterId);
 
 private:
   int wakeup();