VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Removed remaining call to CardContainer.getKey

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@464 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
oepen
2011-07-29 19:44:50 +00:00
parent 46619ae71d
commit dfe2ecba2a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py
View File

@@ -279,7 +279,7 @@ class SAM(object):
def _get_referenced_key(self, p1, p2): def _get_referenced_key(self, p1, p2):
""" """
This method returns the key specified by the p2 parameter. The key may be This method returns the key specified by the p2 parameter. The key may be
stored on the cards filesystem or in memory. stored on the cards filesystem.
@param p1: Specifies the algorithm to use. Needed to know the keylength. @param p1: Specifies the algorithm to use. Needed to know the keylength.
@param p2: Specifies a reference to the key to be used for encryption @param p2: Specifies a reference to the key to be used for encryption
@@ -311,9 +311,6 @@ class SAM(object):
key = fid.readbinary(keylength) key = fid.readbinary(keylength)
except SwError: except SwError:
key = None key = None
if key == None: #Try to read the key from the Key Container
key = self.CardContainer.getKey(p2)
if key != None: if key != None:
return key return key