nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed imports.

Browse Source
This commit is contained in:
Nick Daly 2012-05-15 08:58:15 -05:00
parent 8d44a5c12a
commit 329e92ab86
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ugly_hacks/santiago/pgpprocessor.py
View File

@ -6,7 +6,7 @@ an onion-wrapped PGP message.
FIXME: replace this with a real library. Why doesn't gnupg do this? FIXME: replace this with a real library. Why doesn't gnupg do this?
""" """
from errors import InvalidSignatureError from utilities import InvalidSignatureError
import gnupg import gnupg
import re import re

2
ugly_hacks/santiago/protocols/https.py
View File

@ -1,6 +1,6 @@
"""The HTTPS Santiago listener and sender.""" """The HTTPS Santiago listener and sender."""
from simplesantiago import SantiagoListener, SantiagoSender from santiago import SantiagoListener, SantiagoSender
import cherrypy import cherrypy
import httplib, urllib, urlparse import httplib, urllib, urlparse

13
ugly_hacks/santiago/santiago.py
View File

@ -2,6 +2,12 @@
"""The Santiago service. """The Santiago service.
Santiago is designed to let users negotiate services without third party
interference. By sending OpenPGP signed and encrypted messages over HTTPS (or
other protocols) between parties, I hope to reduce or even prevent MITM attacks.
Santiago can also use the Tor network as a proxy (with Python 2.7 or later),
allowing this negotiation to happen very quietly.
Start me with: Start me with:
$ python -i santiago.py $ python -i santiago.py
@ -35,13 +41,14 @@ or later. A copy of GPLv3 is available [from the Free Software Foundation]
import ast import ast
import cfg import cfg
from collections import defaultdict as DefaultDict from collections import defaultdict as DefaultDict
from errors import InvalidSignatureError, UnwillingHostError
import gnupg import gnupg
import logging import logging
from pgpprocessor import Unwrapper
import re import re
import sys import sys
from pgpprocessor import Unwrapper
import utilities
class Santiago(object): class Santiago(object):
"""This Santiago is a less extensible Santiago. """This Santiago is a less extensible Santiago.
@ -513,7 +520,7 @@ if __name__ == "__main__":
logging.getLogger().setLevel(logging.DEBUG) logging.getLogger().setLevel(logging.DEBUG)
cert = "santiago.crt" cert = "santiago.crt"
mykey = load_config("production.cfg").get("pgpprocessor", "keyid") mykey = utilities.load_config("production.cfg").get("pgpprocessor", "keyid")
listeners = { "https": { "socket_port": 8080, listeners = { "https": { "socket_port": 8080,
"ssl_certificate": cert, "ssl_certificate": cert,