Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: switch imKey to staging env #87

Closed
wants to merge 2 commits into from
Closed

test: switch imKey to staging env #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ace33f1
test: imKey switch to staging env
xiaoguang1010 Apr 12, 2024
67d4a35
fix: fix binding timeout error
xiaoguang1010 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions imkey-core/ikc-common/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub const VERSION: &str = "2.10.3";
pub const URL: &str = "https://imkey.online:1000/imkey";
// pub const URL: &str = "https://imkeyserver.com:10444/imkey";
// pub const URL: &str = "https://imkey.online:1000/imkey";
pub const URL: &str = "https://imkeyserver.com:10444/imkey";

pub const TSM_ACTION_SE_SECURE_CHECK: &str = "/seSecureCheck";
pub const TSM_ACTION_APP_DOWNLOAD: &str = "/appDownload";
Expand Down
6 changes: 3 additions & 3 deletions imkey-core/ikc-device/src/device_binding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ use ikc_common::aes::cbc::encrypt_pkcs7;
use ikc_common::apdu::{Apdu, ApduCheck, ImkApdu};
use ikc_common::constants::{
BIND_RESULT_ERROR, BIND_RESULT_SUCCESS, BIND_STATUS_BOUND_OTHER, BIND_STATUS_BOUND_THIS,
BIND_STATUS_UNBOUND, IMK_AID,
BIND_STATUS_UNBOUND, IMK_AID, TIMEOUT_LONG,
};
use ikc_common::utility::sha256_hash;
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
use ikc_transport::hid_api::hid_connect;
use ikc_transport::message::send_apdu;
use ikc_transport::message::{send_apdu, send_apdu_timeout};
use parking_lot::Mutex;
use rand::rngs::OsRng;
use regex::Regex;
Expand Down Expand Up @@ -136,7 +136,7 @@ impl DeviceManage {
let identity_verify_apdu = ImkApdu::identity_verify(&apdu_data);
std::mem::drop(key_manager_obj);
//send command to device
let bind_result = send_apdu(identity_verify_apdu)?;
let bind_result = send_apdu_timeout(identity_verify_apdu, TIMEOUT_LONG)?;
ApduCheck::check_response(&bind_result)?;
let result_code = &bind_result[..bind_result.len() - 4];

Expand Down