add touch-policy cached

This commit is contained in:
Klas Lindfors
2016-03-17 10:52:03 +01:00
parent 4c74ebdc56
commit 7aa6ac93e6
3 changed files with 4 additions and 1 deletions
+1
View File
@@ -205,6 +205,7 @@ extern "C"
#define YKPIV_TOUCHPOLICY_DEFAULT 0 #define YKPIV_TOUCHPOLICY_DEFAULT 0
#define YKPIV_TOUCHPOLICY_NEVER 1 #define YKPIV_TOUCHPOLICY_NEVER 1
#define YKPIV_TOUCHPOLICY_ALWAYS 2 #define YKPIV_TOUCHPOLICY_ALWAYS 2
#define YKPIV_TOUCHPOLICY_CACHED 3
#define YKPIV_IS_EC(a) ((a == YKPIV_ALGO_ECCP256 || a == YKPIV_ALGO_ECCP384)) #define YKPIV_IS_EC(a) ((a == YKPIV_ALGO_ECCP256 || a == YKPIV_ALGO_ECCP384))
#define YKPIV_IS_RSA(a) ((a == YKPIV_ALGO_RSA1024 || a == YKPIV_ALGO_RSA2048)) #define YKPIV_IS_RSA(a) ((a == YKPIV_ALGO_RSA1024 || a == YKPIV_ALGO_RSA2048))
+1 -1
View File
@@ -62,7 +62,7 @@ option "valid-days" - "Time (in days) until the self-signed certificate expires"
option "pin" P "Pin/puk code for verification" string optional option "pin" P "Pin/puk code for verification" string optional
option "new-pin" N "New pin/puk code for changing" string optional dependon="pin" option "new-pin" N "New pin/puk code for changing" string optional dependon="pin"
option "pin-policy" - "Set pin policy for action generate or import-key" values="never","once","always" enum optional option "pin-policy" - "Set pin policy for action generate or import-key" values="never","once","always" enum optional
option "touch-policy" - "Set touch policy for action generate, import-key or set-mgm-key" values="never","always" enum optional option "touch-policy" - "Set touch policy for action generate, import-key or set-mgm-key" values="never","always","cached" enum optional
option "id" - "Id of object for write/read object" int optional option "id" - "Id of object for write/read object" int optional
option "format" f "Format of data for write/read object" values="hex","base64","binary" enum optional default="hex" option "format" f "Format of data for write/read object" values="hex","base64","binary" enum optional default="hex"
option "sign" - "Sign data" flag off hidden option "sign" - "Sign data" flag off hidden
+2
View File
@@ -604,6 +604,8 @@ unsigned char get_touch_policy(enum enum_touch_policy policy) {
return YKPIV_TOUCHPOLICY_NEVER; return YKPIV_TOUCHPOLICY_NEVER;
case touch_policy_arg_always: case touch_policy_arg_always:
return YKPIV_TOUCHPOLICY_ALWAYS; return YKPIV_TOUCHPOLICY_ALWAYS;
case touch_policy_arg_cached:
return YKPIV_TOUCHPOLICY_CACHED;
case touch_policy__NULL: case touch_policy__NULL:
default: default:
return 0; return 0;