From dfe2ecba2af811fab0ad67f7de83a4c4b019acf6 Mon Sep 17 00:00:00 2001 From: oepen Date: Fri, 29 Jul 2011 19:44:50 +0000 Subject: [PATCH] Removed remaining call to CardContainer.getKey git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@464 96b47cad-a561-4643-ad3b-153ac7d7599c --- virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py b/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py index 31ace68..76e7626 100644 --- a/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py +++ b/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py @@ -279,7 +279,7 @@ class SAM(object): def _get_referenced_key(self, p1, p2): """ 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 p2: Specifies a reference to the key to be used for encryption @@ -311,9 +311,6 @@ class SAM(object): key = fid.readbinary(keylength) except SwError: key = None - - if key == None: #Try to read the key from the Key Container - key = self.CardContainer.getKey(p2) if key != None: return key