diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-06-13 17:02:28 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-06-13 17:02:28 +0000 |
| commit | 14a4962ab06743b36481aca9481758a3dd92b035 (patch) | |
| tree | 18e18f55f585a6d7b4a089b9eded04debb8e1c3e /pkcs11-helper.h | |
| parent | 838911cc424dcc0c03db1e9b256965976068c1a1 (diff) | |
| download | openvpn-14a4962ab06743b36481aca9481758a3dd92b035.tar.gz openvpn-14a4962ab06743b36481aca9481758a3dd92b035.tar.xz openvpn-14a4962ab06743b36481aca9481758a3dd92b035.zip | |
-r 1026:1032
https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn
Changes:
1. Updated makefile.w32-vc to include lladdr.*, updated
linkage libraries.
2. Modified lladdr.c to be compiled under visual C.
3. Added retry counter to PKCS#11 PIN hook.
4. Modified PKCS#11 PIN retry loop to return correct error
code when PIN is incorrect.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1038 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'pkcs11-helper.h')
| -rw-r--r-- | pkcs11-helper.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkcs11-helper.h b/pkcs11-helper.h index e2cef6d..f6eb967 100644 --- a/pkcs11-helper.h +++ b/pkcs11-helper.h @@ -151,12 +151,14 @@ typedef void (*pkcs11h_hook_slotevent_t)( typedef PKCS11H_BOOL (*pkcs11h_hook_token_prompt_t)( IN const void *pData, - IN const pkcs11h_token_id_t token + IN const pkcs11h_token_id_t token, + IN const unsigned retry ); typedef PKCS11H_BOOL (*pkcs11h_hook_pin_prompt_t)( IN const void *pData, IN const pkcs11h_token_id_t token, + IN const unsigned retry, OUT char * const szPIN, IN const size_t nMaxPIN ); @@ -357,7 +359,7 @@ pkcs11h_setPINCachePeriod ( */ CK_RV pkcs11h_setMaxLoginRetries ( - IN const int nMaxLoginRetries + IN const unsigned nMaxLoginRetries ); /* |