Use slot enum consistently. Move slot->object translation into libykpiv.

2017-09-26 13:17:07 +02:00
parent 2e818dd914
commit 79464a3d3e
6 changed files with 31 additions and 195 deletions
@@ -300,174 +300,6 @@ int get_slot_hex(enum enum_slot slot_enum) {
  return slot;
 }

-int get_object_id(enum enum_slot slot) {
-  int object;
-
-  switch(slot) {
-    case slot_arg_9a:
-      object = YKPIV_OBJ_AUTHENTICATION;
-      break;
-    case slot_arg_9c:
-      object = YKPIV_OBJ_SIGNATURE;
-      break;
-    case slot_arg_9d:
-      object = YKPIV_OBJ_KEY_MANAGEMENT;
-      break;
-    case slot_arg_9e:
-      object = YKPIV_OBJ_CARD_AUTH;
-      break;
-    case slot_arg_82:
-      object = YKPIV_OBJ_RETIRED1;
-      break;
-    case slot_arg_83:
-      object = YKPIV_OBJ_RETIRED2;
-      break;
-    case slot_arg_84:
-      object = YKPIV_OBJ_RETIRED3;
-      break;
-    case slot_arg_85:
-      object = YKPIV_OBJ_RETIRED4;
-      break;
-    case slot_arg_86:
-      object = YKPIV_OBJ_RETIRED5;
-      break;
-    case slot_arg_87:
-      object = YKPIV_OBJ_RETIRED6;
-      break;
-    case slot_arg_88:
-      object = YKPIV_OBJ_RETIRED7;
-      break;
-    case slot_arg_89:
-      object = YKPIV_OBJ_RETIRED8;
-      break;
-    case slot_arg_8a:
-      object = YKPIV_OBJ_RETIRED9;
-      break;
-    case slot_arg_8b:
-      object = YKPIV_OBJ_RETIRED10;
-      break;
-    case slot_arg_8c:
-      object = YKPIV_OBJ_RETIRED11;
-      break;
-    case slot_arg_8d:
-      object = YKPIV_OBJ_RETIRED12;
-      break;
-    case slot_arg_8e:
-      object = YKPIV_OBJ_RETIRED13;
-      break;
-    case slot_arg_8f:
-      object = YKPIV_OBJ_RETIRED14;
-      break;
-    case slot_arg_90:
-      object = YKPIV_OBJ_RETIRED15;
-      break;
-    case slot_arg_91:
-      object = YKPIV_OBJ_RETIRED16;
-      break;
-    case slot_arg_92:
-      object = YKPIV_OBJ_RETIRED17;
-      break;
-    case slot_arg_93:
-      object = YKPIV_OBJ_RETIRED18;
-      break;
-    case slot_arg_94:
-      object = YKPIV_OBJ_RETIRED19;
-      break;
-    case slot_arg_95:
-      object = YKPIV_OBJ_RETIRED20;
-      break;
-    case slot_arg_f9:
-      object = YKPIV_OBJ_ATTESTATION;
-      break;
-    case slot__NULL:
-    default:
-      object = 0;
-  }
-  return object;
-}
-
-int key_to_object_id(int key) {
-  int object;
-
-  switch(key) {
-  case YKPIV_KEY_AUTHENTICATION:
-    object = YKPIV_OBJ_AUTHENTICATION;
-    break;
-  case YKPIV_KEY_CARDMGM:
-    object = YKPIV_OBJ_SIGNATURE;
-    break;
-  case YKPIV_KEY_KEYMGM:
-    object = YKPIV_OBJ_KEY_MANAGEMENT;
-    break;
-  case YKPIV_KEY_CARDAUTH:
-    object = YKPIV_OBJ_CARD_AUTH;
-    break;
-  case YKPIV_KEY_RETIRED1:
-    object = YKPIV_OBJ_RETIRED1;
-    break;
-  case YKPIV_KEY_RETIRED2:
-    object = YKPIV_OBJ_RETIRED2;
-    break;
-  case YKPIV_KEY_RETIRED3:
-    object = YKPIV_OBJ_RETIRED3;
-    break;
-  case YKPIV_KEY_RETIRED4:
-    object = YKPIV_OBJ_RETIRED4;
-    break;
-  case YKPIV_KEY_RETIRED5:
-    object = YKPIV_OBJ_RETIRED5;
-    break;
-  case YKPIV_KEY_RETIRED6:
-    object = YKPIV_OBJ_RETIRED6;
-    break;
-  case YKPIV_KEY_RETIRED7:
-    object = YKPIV_OBJ_RETIRED7;
-    break;
-  case YKPIV_KEY_RETIRED8:
-    object = YKPIV_OBJ_RETIRED8;
-    break;
-  case YKPIV_KEY_RETIRED9:
-    object = YKPIV_OBJ_RETIRED9;
-    break;
-  case YKPIV_KEY_RETIRED10:
-    object = YKPIV_OBJ_RETIRED10;
-    break;
-  case YKPIV_KEY_RETIRED11:
-    object = YKPIV_OBJ_RETIRED11;
-    break;
-  case YKPIV_KEY_RETIRED12:
-    object = YKPIV_OBJ_RETIRED12;
-    break;
-  case YKPIV_KEY_RETIRED13:
-    object = YKPIV_OBJ_RETIRED13;
-    break;
-  case YKPIV_KEY_RETIRED14:
-    object = YKPIV_OBJ_RETIRED14;
-    break;
-  case YKPIV_KEY_RETIRED15:
-    object = YKPIV_OBJ_RETIRED15;
-    break;
-  case YKPIV_KEY_RETIRED16:
-    object = YKPIV_OBJ_RETIRED16;
-    break;
-  case YKPIV_KEY_RETIRED17:
-    object = YKPIV_OBJ_RETIRED17;
-    break;
-  case YKPIV_KEY_RETIRED18:
-    object = YKPIV_OBJ_RETIRED18;
-    break;
-  case YKPIV_KEY_RETIRED19:
-    object = YKPIV_OBJ_RETIRED19;
-    break;
-  case YKPIV_KEY_RETIRED20:
-    object = YKPIV_OBJ_RETIRED20;
-    break;
-  default:
-    object = 0;
-  }
-  return object;
-}
-
 bool set_component(unsigned char *in_ptr, const BIGNUM *bn, int element_len) {
  int real_len = BN_num_bytes(bn);