laforge
/
cyberflex-shell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

funky ATRs, add new files to project file, more conscise output 

git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@96 f711b948-2313-0410-aaa9-d29f33439f0b
This commit is contained in:
hploetz 2006-06-18 12:32:41 +00:00
parent 73ece936e8
commit 120d067e80
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cards/mtcos_card.py
View File

@ -6,7 +6,10 @@ class MTCOS_Card(ISO_7816_4_Card,building_blocks.Card_with_80_aa):
DRIVER_NAME = "MTCOS"
ATRS = [
("3bfe9100ff918171fe40004120001177b1024d54434f537301cf", None),
# This is the correct ATR according to PC/SC v.2 part 3
("3b8980014d54434f53730102013f", None),
# This is what SCM SCR331/SDI010 shows
("3BFE9100FF918171FE40004120001177B1024D54434F537301CF", None),
]
COMMANDS = {
@ -143,19 +146,22 @@ class MTCOS_Card(ISO_7816_4_Card,building_blocks.Card_with_80_aa):
b5 = ord(part[4])
b6 = ord(part[5])
if b5 == 0xff:
partresponse.append("\nSecure messaging: no checksum required")
if b5 == 0xff and b6 == 0xff and len(secrets) <= 1:
partresponse.append(", No secure messaging required")
else:
partresponse.append("\nCryptographic checksum with ")
decode_key(b5)
if b6 == 0xff:
partresponse.append("\nSecure messaging: no encryption required")
elif not (b6 & 0x20):
partresponse.append("\nEncryption with ")
decode_key(b6)
else:
partresponse.append("\nEncryption: RFU")
if b5 == 0xff:
partresponse.append("\nSecure messaging: no checksum required")
else:
partresponse.append("\nCryptographic checksum with ")
decode_key(b5)
if b6 == 0xff:
partresponse.append("\nSecure messaging: no encryption required")
elif not (b6 & 0x20):
partresponse.append("\nEncryption with ")
decode_key(b6)
else:
partresponse.append("\nEncryption: RFU")
if len(value) != 6:
results.append("\n\t".join("".join(partresponse).splitlines()))

17
cyberflex-shell.e3p
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-3.7.dtd">
<!-- Project file for project cyberflex-shell -->
<!-- Saved: 2006-05-22, 09:18:42 -->
<!-- Saved: 2006-06-18, 14:02:00 -->
<!-- Copyright (C) 2006 Henryk Plötz, henryk@ploetzli.ch -->
<Project version="3.7">
<ProgLanguage mixed="0">Python</ProgLanguage>
@ -57,6 +57,21 @@
<Dir>cards</Dir>
<Name>starcos_card.py</Name>
</Source>
<Source>
<Name>tlvdecoder.py</Name>
</Source>
<Source>
<Dir>cards</Dir>
<Name>gsm_card.py</Name>
</Source>
<Source>
<Dir>cards</Dir>
<Name>building_blocks.py</Name>
</Source>
<Source>
<Dir>cards</Dir>
<Name>mtcos_card.py</Name>
</Source>
</Sources>
<Forms>
</Forms>