Merge pull request #11470 from PeculiarVentures/master

Fix type error
This commit is contained in:
Andy
2016-09-24 16:55:12 -07:00
committed by GitHub
2 changed files with 5 additions and 3 deletions

View File

@@ -2131,6 +2131,7 @@ declare module "graphene-pk11" {
SO_PIN_FINAL_TRY,
SO_PIN_LOCKED,
SO_PIN_TO_BE_CHANGED,
ERROR_STATE,
}
class Token extends HandleObject {

View File

@@ -210,7 +210,7 @@ declare module "pkcs11js" {
* @param {Handle} slot ID of token's slot
* @returns {Handle[]} Gets mech. array
*/
C_GetMechanismList(slot: Handle): number[];
C_GetMechanismList(slot: Handle): Handle[];
/**
* Obtains information about a particular mechanism possibly supported by a token
*
@@ -218,7 +218,7 @@ declare module "pkcs11js" {
* @param {Handle} mech Type of mechanism
* @returns {MechanismInfo} Receives mechanism info
*/
C_GetMechanismInfo(slot: Handle, mech: number): MechanismInfo;
C_GetMechanismInfo(slot: Handle, mech: Handle): MechanismInfo;
/* Session management */
@@ -1192,6 +1192,7 @@ declare module "pkcs11js" {
const CKF_WRAP: number;
const CKF_UNWRAP: number;
const CKF_DERIVE: number;
const CKF_CLOCK_ON_TOKEN: number;
// Certificates
const CKC_X_509: number;
@@ -1223,4 +1224,4 @@ declare module "pkcs11js" {
const CK_PARAMS_RSA_OAEP: number;
const CK_PARAMS_RSA_PSS: number;
const CK_PARAMS_EC_DH: number;
}
}