From 2114dea6871a0a871e4adeaf334256077edafdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Sat, 22 Apr 2017 11:53:52 +0300 Subject: [PATCH] pkcs15: fix commit 76d59158 auth object regressions Few conversions of SC_PKCS15_TYPE_AUTH_PIN to SC_PKCS15_TYPE_AUTH were missed. --- src/libopensc/pkcs15.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c index 7eabdd4b..a31abb45 100644 --- a/src/libopensc/pkcs15.c +++ b/src/libopensc/pkcs15.c @@ -1427,7 +1427,7 @@ compare_obj_flags(struct sc_pkcs15_object *obj, unsigned int mask, unsigned int unsigned int flags; switch (obj->type & SC_PKCS15_TYPE_CLASS_MASK) { - case SC_PKCS15_TYPE_AUTH_PIN: + case SC_PKCS15_TYPE_AUTH: auth_info = (struct sc_pkcs15_auth_info *) obj->data; if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) return 0; @@ -1448,7 +1448,7 @@ compare_obj_reference(struct sc_pkcs15_object *obj, int value) int reference; switch (obj->type & SC_PKCS15_TYPE_CLASS_MASK) { - case SC_PKCS15_TYPE_AUTH_PIN: + case SC_PKCS15_TYPE_AUTH: auth_info = (struct sc_pkcs15_auth_info *) obj->data; if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) return 0; @@ -1478,7 +1478,7 @@ compare_obj_path(struct sc_pkcs15_object *obj, const struct sc_path *path) return sc_compare_path(&((struct sc_pkcs15_skey_info *) data)->path, path); case SC_PKCS15_TYPE_CERT: return sc_compare_path(&((struct sc_pkcs15_cert_info *) data)->path, path); - case SC_PKCS15_TYPE_AUTH_PIN: + case SC_PKCS15_TYPE_AUTH: return sc_compare_path(&((struct sc_pkcs15_auth_info *) data)->path, path); case SC_PKCS15_TYPE_DATA_OBJECT: return sc_compare_path(&((struct sc_pkcs15_data_info *) data)->path, path); @@ -2651,7 +2651,7 @@ sc_pkcs15_get_object_id(const struct sc_pkcs15_object *obj, struct sc_pkcs15_id case SC_PKCS15_TYPE_SKEY: *out = ((struct sc_pkcs15_skey_info *) obj->data)->id; break; - case SC_PKCS15_TYPE_AUTH_PIN: + case SC_PKCS15_TYPE_AUTH: *out = ((struct sc_pkcs15_auth_info *) obj->data)->auth_id; break; case SC_PKCS15_TYPE_DATA_OBJECT: