From d5222c10b716b36dad1657c5b0267419d6392c1d Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Tue, 24 Jun 2014 14:07:15 +0200
Subject: [PATCH] add macros for piv objects

---
 lib/ykpiv.h | 14 ++++++++++++++
 tool/util.c |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/ykpiv.h b/lib/ykpiv.h
index 0207f13..ebdca28 100644
--- a/lib/ykpiv.h
+++ b/lib/ykpiv.h
@@ -89,6 +89,20 @@ extern "C"
 #define YKPIV_KEY_KEYMGM 0x9d
 #define YKPIV_KEY_CARDAUTH 0x9e
 
+#define YKPIV_OBJ_CAPABILITY 0x5fc107
+#define YKPIV_OBJ_CHUID 0x5fc102
+#define YKPIV_OBJ_AUTHENTICATION 0x5fc105 /* cert for 9a key */
+#define YKPIV_OBJ_FINGERPRINTS 0x5fc103
+#define YKPIV_OBJ_SECURITY 0x5fc106
+#define YKPIV_OBJ_FACIAL 0x5fc108
+#define YKPIV_OBJ_PRINTED 0x5fc109
+#define YKPIV_OBJ_SIGNATURE 0x5fc10a /* cert for 9c key */
+#define YKPIV_OBJ_KEY_MANAGEMENT 0x5fc10b /* cert for 9d key */
+#define YKPIV_OBJ_CARD_AUTH 0x5fc101 /* cert for 9e key */
+#define YKPIV_OBJ_DISCOVERY 0x7e
+#define YKPIV_OBJ_KEY_HISTORY 0x5fc10c
+#define YKPIV_OBJ_IRIS 0x5fc121
+
 #define YKPIV_INS_VERIFY 0x20
 #define YKPIV_INS_CHANGE_REFERENCE 0x24
 #define YKPIV_INS_RESET_RETRY 0x2c
diff --git a/tool/util.c b/tool/util.c
index 7e7421a..79097cc 100644
--- a/tool/util.c
+++ b/tool/util.c
@@ -185,16 +185,16 @@ int get_object_id(enum enum_slot slot) {
 
   switch(slot) {
     case slot_arg_9a:
-      object = 0x5fc105;
+      object = YKPIV_OBJ_AUTHENTICATION;
       break;
     case slot_arg_9c:
-      object = 0x5fc10a;
+      object = YKPIV_OBJ_SIGNATURE;
       break;
     case slot_arg_9d:
-      object = 0x5fc10b;
+      object = YKPIV_OBJ_KEY_MANAGEMENT;
       break;
     case slot_arg_9e:
-      object = 0x5fc101;
+      object = YKPIV_OBJ_CARD_AUTH;
       break;
     case slot__NULL:
     default: