Some fixes

domschiener · Sep 8, 2015 · 6a7d984 · 6a7d984
1 parent e04316c
commit 6a7d984
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/entities.txt b/entities.txt
diff --git a/helpers.py b/helpers.py
@@ -13,7 +13,8 @@
 from pprint import pprint
 
 
-gpg = gnupg.GPG(homedir='/Users/domsch/.gnupg', keyring='pubring.gpg', secring='secring.gpg')
+#IF YOU HAVE A DIFFERENT LOCAL PGP DIRECTORY, CHANGE IT HERE
+gpg = gnupg.GPG(homedir='~/.gnupg', keyring='pubring.gpg', secring='secring.gpg')
 
 
 ### 
@@ -74,7 +75,7 @@ def generate_privkey(source):
 
 
 def store_entity(personal_entity):
-    entity_stored = open("/Users/domsch/Desktop/fingerprint-project/entities.txt", 'a')
+    entity_stored = open("./entities.txt", 'a')
     pickle.dump(personal_entity, entity_stored)
     entity_stored.close()
     return personal_entity 
@@ -87,7 +88,7 @@ def store_entity(personal_entity):
 
 def get_entities():
     list_entities = []
-    with open("/Users/domsch/Desktop/fingerprint-project/entities.txt", "rb") as entity_stored:
+    with open("./entities.txt", "rb") as entity_stored:
         try:
             while True:
                 get_entity = pickle.load(entity_stored)
@@ -185,9 +186,6 @@ def SP_authorize(entity, name, gpg_key):
 
 
 def accesstoken(gpg_fingerprint, identity):
-    print
-    print "Fingerprint: "
-    print gpg_fingerprint
     return gpg.encrypt(identity,gpg_fingerprint)
 
 

diff --git a/main.py b/main.py
@@ -608,6 +608,9 @@ def auth_choice(self):
                 wrong_path =  tk.Label(self, text="Wrong file path. Please provide the correct and full path to your desired image", wraplength=400)
                 wrong_path.pack()
         else:
+            ##
+            ## FILES FOR FINGERPRINT SCANNER WILL BE RELEASED SOON
+            ##
             if os.path.isfile("./fingerprint.bmp"):
                 priv_key = generate_privkey(open("./fingerprint.bmp",'rb+').read())
                 self.generate()
@@ -782,6 +785,9 @@ def authenticate_entity(self):
                 wrong_path =  tk.Label(self, text="Wrong file path. Please provide the correct and full path to your desired image", wraplength=400)
                 wrong_path.pack()
         else:
+            ##
+            ## FILES FOR FINGERPRINT SCANNER WILL BE RELEASED SOON
+            ##
             chosen_secret = "./fingerprint.bmp"
 
             if os.path.isfile(chosen_secret):