deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More PythonUSB change

Browse Source
This commit is contained in:
NIIBE Yutaka
2015-08-04 11:11:03 +09:00
parent b2ca03dc19
commit 9a11e954d8
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/features/steps.py
View File

@@ -7,6 +7,7 @@ import ast
import gnuk_token as gnuk import gnuk_token as gnuk
import rsa_keys import rsa_keys
from array import array
@Before @Before
def ini(sc): def ini(sc):
@@ -26,7 +27,7 @@ def cmd_change_reference_data(who_str,pass_str):
@Given("cmd_put_data with (.*) and (\".*\")") @Given("cmd_put_data with (.*) and (\".*\")")
def cmd_put_data(tag_str,content_str_repr): def cmd_put_data(tag_str,content_str_repr):
content_str = ast.literal_eval(content_str_repr) content_str = ast.literal_eval("b" + content_str_repr + "")
tag = int(tag_str, 16) tag = int(tag_str, 16)
tagh = tag >> 8 tagh = tag >> 8
tagl = tag & 0xff tagl = tag & 0xff
@@ -93,7 +94,7 @@ def compute_signature_on_host(keyno_str):
@Given("a plain text (\".*\")") @Given("a plain text (\".*\")")
def set_plaintext(content_str_repr): def set_plaintext(content_str_repr):
scc.plaintext = ast.literal_eval(content_str_repr) scc.plaintext = ast.literal_eval("b" + content_str_repr + "")
@Given("encrypt it on host with RSA key pair (.*)$") @Given("encrypt it on host with RSA key pair (.*)$")
def encrypt_on_host(keyno_str): def encrypt_on_host(keyno_str):
@@ -106,7 +107,7 @@ def encrypt_on_host_public_key():
@Given("let a token decrypt encrypted data") @Given("let a token decrypt encrypted data")
def decrypt(): def decrypt():
scc.result = ftc.token.cmd_pso_longdata(0x80, 0x86, scc.ciphertext) scc.result = ftc.token.cmd_pso_longdata(0x80, 0x86, scc.ciphertext).tostring()
@Given("USB version string of the token") @Given("USB version string of the token")
def usb_version_string(): def usb_version_string():
@@ -129,7 +130,7 @@ def remove_key(openpgp_keyno_str):
def generate_key(openpgp_keyno_str): def generate_key(openpgp_keyno_str):
openpgp_keyno = int(openpgp_keyno_str) openpgp_keyno = int(openpgp_keyno_str)
pubkey_info = ftc.token.cmd_genkey(openpgp_keyno) pubkey_info = ftc.token.cmd_genkey(openpgp_keyno)
scc.data = rsa_keys.calc_fpr(pubkey_info[0], pubkey_info[1]) scc.data = rsa_keys.calc_fpr(pubkey_info[0].tostring(), pubkey_info[1].tostring())
@When("put the first data to (.*)") @When("put the first data to (.*)")
def cmd_put_data_first_with_result(tag_str): def cmd_put_data_first_with_result(tag_str):
@@ -148,8 +149,8 @@ def cmd_put_data_second_with_result(tag_str):
@Then("you should get: (.*)") @Then("you should get: (.*)")
def check_result(v): def check_result(v):
value = ast.literal_eval("'" + v + "'") value = ast.literal_eval("b'" + v + "'")
assert_equal(scc.result, value) assert_equal(scc.result, array('B', value))
@Then("it should get success") @Then("it should get success")
def check_success(): def check_success():
@@ -157,7 +158,7 @@ def check_success():
@Then("you should get NULL") @Then("you should get NULL")
def check_null(): def check_null():
assert_equal(scc.result, "") assert_equal(scc.result, array('B'))
@Then("data should match: (.*)") @Then("data should match: (.*)")
def check_regexp(re): def check_regexp(re):

8
tool/gnuk_token.py
View File

@@ -305,7 +305,7 @@ class gnuk_token(object):
if len(sw) != 2: if len(sw) != 2:
raise ValueError, sw raise ValueError, sw
if sw[0] == 0x90 and sw[1] == 0x00: if sw[0] == 0x90 and sw[1] == 0x00:
return "" return array('B')
elif sw[0] != 0x61: elif sw[0] != 0x61:
raise ValueError("%02x%02x" % (sw[0], sw[1])) raise ValueError("%02x%02x" % (sw[0], sw[1]))
return self.cmd_get_response(sw[1]) return self.cmd_get_response(sw[1])
@@ -358,7 +358,7 @@ class gnuk_token(object):
if len(sw) != 2: if len(sw) != 2:
raise ValueError(sw) raise ValueError(sw)
if sw[0] == 0x90 and sw[1] == 0x00: if sw[0] == 0x90 and sw[1] == 0x00:
return "" return array('B')
elif sw[0] != 0x61: elif sw[0] != 0x61:
raise ValueError("%02x%02x" % (sw[0], sw[1])) raise ValueError("%02x%02x" % (sw[0], sw[1]))
return self.cmd_get_response(sw[1]) return self.cmd_get_response(sw[1])
@@ -384,7 +384,7 @@ class gnuk_token(object):
if len(sw) != 2: if len(sw) != 2:
raise ValueError(sw) raise ValueError(sw)
if sw[0] == 0x90 and sw[1] == 0x00: if sw[0] == 0x90 and sw[1] == 0x00:
return "" return array('B')
elif sw[0] != 0x61: elif sw[0] != 0x61:
raise ValueError("%02x%02x" % (sw[0], sw[1])) raise ValueError("%02x%02x" % (sw[0], sw[1]))
return self.cmd_get_response(sw[1]) return self.cmd_get_response(sw[1])
@@ -401,7 +401,7 @@ class gnuk_token(object):
if len(sw) != 2: if len(sw) != 2:
raise ValueError(sw) raise ValueError(sw)
if sw[0] == 0x90 and sw[1] == 0x00: if sw[0] == 0x90 and sw[1] == 0x00:
return "" return array('B')
elif sw[0] != 0x61: elif sw[0] != 0x61:
raise ValueError("%02x%02x" % (sw[0], sw[1])) raise ValueError("%02x%02x" % (sw[0], sw[1]))
pk = self.cmd_get_response(sw[1]) pk = self.cmd_get_response(sw[1])