From: Klas Lindfors Date: Fri, 12 Apr 2013 12:37:42 +0000 (+0200) Subject: move modes_map to ykpers-json.c X-Git-Tag: v1.13.0~45 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2709997c6da65a802a56b40a1ee327c8867b6e63;p=yubikey-personalization move modes_map to ykpers-json.c --- diff --git a/ykpers-json.c b/ykpers-json.c index 13eb1b5..6d0ac79 100644 --- a/ykpers-json.c +++ b/ykpers-json.c @@ -36,6 +36,14 @@ #include #include +static struct map_st modes_map[] = { + { MODE_OATH_HOTP, 0, "oathHOTP", 0, 0 }, + { MODE_CHAL_HMAC, 0, "hmacCR", 0, 0 }, + { MODE_STATIC_TICKET, 0, "staticTicket", 0, 0 }, /* XXX: name? */ + { MODE_CHAL_YUBICO, 0, "yubicoCR", 0, 0 }, + { MODE_OTP_YUBICO, 0, "yubicoOTP", 0, 0 }, + { 0, 0, 0, 0, 0 } +}; int ykp_json_export_cfg(const YKP_CONFIG *cfg, char *json, size_t len) { json_object *jobj = json_object_new_object(); diff --git a/ykpers_lcl.h b/ykpers_lcl.h index 18665a4..715e12c 100644 --- a/ykpers_lcl.h +++ b/ykpers_lcl.h @@ -128,15 +128,6 @@ static struct map_st extended_flags_map[] = { { 0, 0, 0, 0, 0 } }; -static struct map_st modes_map[] = { - { MODE_OATH_HOTP, 0, "oathHOTP", 0, 0 }, - { MODE_CHAL_HMAC, 0, "hmacCR", 0, 0 }, - { MODE_STATIC_TICKET, 0, "staticTicket", 0, 0 }, /* XXX: name? */ - { MODE_CHAL_YUBICO, 0, "yubicoCR", 0, 0 }, - { MODE_OTP_YUBICO, 0, "yubicoOTP", 0, 0 }, - { 0, 0, 0, 0, 0 } -}; - # ifdef __cplusplus } # endif