October 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Various man page markup fixes.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 628eb5213393b7de966dc2fa5a740e7e0c2b00f8 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 23:50:00 2013 -0700 Various man page markup fixes. --- doc/flashproxy-client.1.txt | 15 +++++++-------- doc/flashproxy-reg-http.1.txt | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index 6c41fbc..89a32b5 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -40,7 +40,6 @@ omitted, it uses a public default. OPTIONS ------- - **-4**:: Registration helpers use IPv4. @@ -63,31 +62,31 @@ OPTIONS **-h**, **--help**:: Display a help message and exit. -**-l**, **--log** __FILENAME__:: +**-l**, **--log**=__FILENAME__:: Write log to __FILENAME__ (default is stdout). -**--pidfile** __FILENAME__:: +**--pidfile**=__FILENAME__:: Write PID to __FILENAME__ after daemonizing. **--port-forwarding**:: Attempt to forward __REMOTE__ port. **--port-forwarding-helper**=__PROGRAM__:: - Use the given PROGRAM to forward ports (default "tor-fw-helper"). Implies - --port-forwarding. + Use the given __PROGRAM__ to forward ports (default "tor-fw-helper"). Implies + **--port-forwarding**. **--port-forwarding-external**=__PORT__:: Forward the external __PORT__ to __REMOTE__ on the local host (default same - as REMOTE). Implies --port-forwarding. + as REMOTE). Implies **--port-forwarding**. **-r**, **--register**:: Register with the facilitator. **--register-addr**=__ADDR__:: - Register the given address (in case it differs from REMOTE). Implies --register. + Register the given address (in case it differs from __REMOTE__). Implies **--register**. **--register-methods**=__METHOD__[,__METHOD__]:: - Register using the given comma-separated list of methods. Implies --register. + Register using the given comma-separated list of methods. Implies **--register**. Possible methods are: appspot, email, http. Default is "appspot,email,http". **--unsafe-logging**:: diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt index dd6779c..8f23a21 100644 --- a/doc/flashproxy-reg-http.1.txt +++ b/doc/flashproxy-reg-http.1.txt @@ -27,7 +27,7 @@ OPTIONS **-6**:: Name lookups use only IPv6. -**-f**, **--facilitator**:: +**-f**, **--facilitator**=__URL__:: Register with the given facilitator (default "https://fp-facilitator.org/"). **-h**, **--help**::

1 0

[flashproxy/master] Add some missing options to man pages.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 1cb5a8a751105d3741c1e3486a20b982fdabce64 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 23:54:41 2013 -0700 Add some missing options to man pages. --- doc/flashproxy-reg-appspot.1.txt | 9 +++++++++ doc/flashproxy-reg-email.1.txt | 3 +++ doc/flashproxy-reg-http.1.txt | 3 +++ 3 files changed, 15 insertions(+) diff --git a/doc/flashproxy-reg-appspot.1.txt b/doc/flashproxy-reg-appspot.1.txt index df4a862..55e781d 100644 --- a/doc/flashproxy-reg-appspot.1.txt +++ b/doc/flashproxy-reg-appspot.1.txt @@ -30,6 +30,12 @@ Requires the **flashproxy-reg-url** program. OPTIONS ------- +**-4**:: + Name lookups use only IPv4. + +**-6**:: + Name lookups use only IPv6. + **--disable-pin**:: Don't check the server's public key against a list of known pins. You can use this if the server's public key has changed and this @@ -41,6 +47,9 @@ OPTIONS **-h**, **--help**:: Display help message and exit. +**--unsafe-logging**:: + Don't scrub IP addresses from logs. + SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/** diff --git a/doc/flashproxy-reg-email.1.txt b/doc/flashproxy-reg-email.1.txt index 9267975..90a2e49 100644 --- a/doc/flashproxy-reg-email.1.txt +++ b/doc/flashproxy-reg-email.1.txt @@ -58,6 +58,9 @@ OPTIONS **-s**, **--smtp**=__HOST__[:__PORT__]:: Use the given SMTP server (default is "gmail-smtp-in.l.google.com:25"). +**--unsafe-logging**:: + Don't scrub IP addresses from logs. + SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/** diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt index 8f23a21..ca1f801 100644 --- a/doc/flashproxy-reg-http.1.txt +++ b/doc/flashproxy-reg-http.1.txt @@ -33,6 +33,9 @@ OPTIONS **-h**, **--help**:: Display help message and exit. +**--unsafe-logging**:: + Don't scrub IP addresses from logs. + SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/**

1 0

[flashproxy/master] Regen man pages.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit dcc470015b37c2edda43585eefedc49ff94a6b31 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 23:56:21 2013 -0700 Regen man pages. --- doc/flashproxy-client.1 | 49 ++++++++++++++++++++++++------------------ doc/flashproxy-reg-appspot.1 | 21 +++++++++++++++--- doc/flashproxy-reg-email.1 | 11 +++++++--- doc/flashproxy-reg-http.1 | 15 ++++++++----- 4 files changed, 64 insertions(+), 32 deletions(-) diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1 index 8de4e0e..27e6b5f 100644 --- a/doc/flashproxy-client.1 +++ b/doc/flashproxy-client.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-client .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 07/01/2013 +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-CLIENT" "1" "07/01/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-CLIENT" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -78,35 +78,20 @@ Encrypt registrations to the given PEM\-formatted public key (default built\-in) Display a help message and exit\&. .RE .PP -\fB\-l\fR, \fB\-\-log\fR \fIFILENAME\fR +\fB\-l\fR, \fB\-\-log\fR=\fIFILENAME\fR .RS 4 Write log to \fIFILENAME\fR (default is stdout)\&. .RE .PP -\fB\-\-pidfile\fR \fIFILENAME\fR +\fB\-\-pidfile\fR=\fIFILENAME\fR .RS 4 Write PID to \fIFILENAME\fR after daemonizing\&. .RE .PP -\fB\-r\fR, \fB\-\-register\fR -.RS 4 -Register with the facilitator\&. -.RE -.PP -\fB\-\-register\-addr\fR=\fIADDR\fR -.RS 4 -Register the given address (in case it differs from REMOTE)\&. Implies \-\-register\&. -.RE -.PP -\fB\-\-register\-methods\fR=\fIMETHOD\fR[,\fIMETHOD\fR] -.RS 4 -Register using the given comma\-separated list of methods\&. Implies \-\-register\&. Possible methods are: appspot, email, http\&. Default is "appspot,email,http"\&. -.RE -.PP \fB\-\-port\-forwarding\fR .RS 4 Attempt to forward @@ -116,7 +101,10 @@ port\&. .PP \fB\-\-port\-forwarding\-helper\fR=\fIPROGRAM\fR .RS 4 -Use the given PROGRAM to forward ports (default "tor\-fw\-helper")\&. Implies \-\-port\-forwarding\&. +Use the given +\fIPROGRAM\fR +to forward ports (default "tor\-fw\-helper")\&. Implies +\fB\-\-port\-forwarding\fR\&. .RE .PP \fB\-\-port\-forwarding\-external\fR=\fIPORT\fR @@ -125,7 +113,26 @@ Forward the external \fIPORT\fR to \fIREMOTE\fR -on the local host (default same as REMOTE)\&. Implies \-\-port\-forwarding\&. +on the local host (default same as REMOTE)\&. Implies +\fB\-\-port\-forwarding\fR\&. +.RE +.PP +\fB\-r\fR, \fB\-\-register\fR +.RS 4 +Register with the facilitator\&. +.RE +.PP +\fB\-\-register\-addr\fR=\fIADDR\fR +.RS 4 +Register the given address (in case it differs from +\fIREMOTE\fR)\&. Implies +\fB\-\-register\fR\&. +.RE +.PP +\fB\-\-register\-methods\fR=\fIMETHOD\fR[,\fIMETHOD\fR] +.RS 4 +Register using the given comma\-separated list of methods\&. Implies +\fB\-\-register\fR\&. Possible methods are: appspot, email, http\&. Default is "appspot,email,http"\&. .RE .PP \fB\-\-unsafe\-logging\fR diff --git a/doc/flashproxy-reg-appspot.1 b/doc/flashproxy-reg-appspot.1 index b195c89..e77394b 100644 --- a/doc/flashproxy-reg-appspot.1 +++ b/doc/flashproxy-reg-appspot.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-reg-appspot .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 05/31/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-APPSPOT" "1" "05/31/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-APPSPOT" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -41,6 +41,16 @@ This program uses a trick to talk to App Engine, even though appspot\&.com may b Requires the \fBflashproxy\-reg\-url\fR program\&. .SH "OPTIONS" .PP +\fB\-4\fR +.RS 4 +Name lookups use only IPv4\&. +.RE +.PP +\fB\-6\fR +.RS 4 +Name lookups use only IPv6\&. +.RE +.PP \fB\-\-disable\-pin\fR .RS 4 Don\(cqt check the server\(cqs public key against a list of known pins\&. You can use this if the server\(cqs public key has changed and this program hasn\(cqt been updated yet\&. @@ -55,6 +65,11 @@ Encrypt registrations to the given PEM\-formatted public key (default built\-in) .RS 4 Display help message and exit\&. .RE +.PP +\fB\-\-unsafe\-logging\fR +.RS 4 +Don\(cqt scrub IP addresses from logs\&. +.RE .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR diff --git a/doc/flashproxy-reg-email.1 b/doc/flashproxy-reg-email.1 index ea6729e..1adb60e 100644 --- a/doc/flashproxy-reg-email.1 +++ b/doc/flashproxy-reg-email.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-reg-email .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 05/31/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-EMAIL" "1" "05/31/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-EMAIL" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -84,6 +84,11 @@ Display help message and exit\&. .RS 4 Use the given SMTP server (default is "gmail\-smtp\-in\&.l\&.google\&.com:25")\&. .RE +.PP +\fB\-\-unsafe\-logging\fR +.RS 4 +Don\(cqt scrub IP addresses from logs\&. +.RE .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR diff --git a/doc/flashproxy-reg-http.1 b/doc/flashproxy-reg-http.1 index 86640dd..a56d5a0 100644 --- a/doc/flashproxy-reg-http.1 +++ b/doc/flashproxy-reg-http.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-reg-http .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 04/30/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-HTTP" "1" "04/30/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-HTTP" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -47,15 +47,20 @@ Name lookups use only IPv4\&. Name lookups use only IPv6\&. .RE .PP -\fB\-f\fR, \fB\-\-facilitator\fR +\fB\-f\fR, \fB\-\-facilitator\fR=\fIURL\fR .RS 4 -Register with the given facilitator (by default "https://fp\-facilitator\&.org/")\&. +Register with the given facilitator (default "https://fp\-facilitator\&.org/")\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR .RS 4 Display help message and exit\&. .RE +.PP +\fB\-\-unsafe\-logging\fR +.RS 4 +Don\(cqt scrub IP addresses from logs\&. +.RE .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR

1 0

[flashproxy/master] Align option table columns.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 663ec51624ac076ae069738a019d02e79151719d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 23:59:38 2013 -0700 Align option table columns. --- flashproxy-reg-appspot | 14 +++++++------- flashproxy-reg-email | 2 +- flashproxy-reg-http | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index bcdab6b..139cd1e 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -84,14 +84,14 @@ Register with a flash proxy facilitator through a Google App Engine app. By default the remote address registered is "%(remote_addr)s" (the external IP address is guessed). - -4 name lookups use only IPv4. - -6 name lookups use only IPv6. - --disable-pin don't check server public key against a known pin. + -4 name lookups use only IPv4. + -6 name lookups use only IPv6. + --disable-pin don't check server public key against a known pin. --facilitator-pubkey=FILENAME - encrypt registrations to the given PEM-formatted - public key (default built-in). - -h, --help show this help. - --unsafe-logging don't scrub IP addresses from logs.\ + encrypt registrations to the given PEM-formatted + public key (default built-in). + -h, --help show this help. + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), diff --git a/flashproxy-reg-email b/flashproxy-reg-email index ab39390..3fdaf90 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -119,7 +119,7 @@ This program requires the M2Crypto library for Python. -h, --help show this help. -s, --smtp=HOST[:PORT] use the given SMTP server (default "%(smtp_addr)s"). - --unsafe-logging don't scrub IP addresses from logs.\ + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), diff --git a/flashproxy-reg-http b/flashproxy-reg-http index f0014d9..2c2f274 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -30,7 +30,7 @@ remote address registered is "%(remote_addr)s". -f, --facilitator=URL register with the given facilitator (default "%(fac_url)s"). -h, --help show this help. - --unsafe-logging don't scrub IP addresses from logs.\ + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "fac_url": DEFAULT_FACILITATOR_URL,

1 0

[flashproxy/master] Use safe_format_addr in flashproxy-reg-http.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 3baf3a5ca007354319084aebae4f3a74da3adde0 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 22:02:31 2013 -0700 Use safe_format_addr in flashproxy-reg-http. --- flashproxy-reg-http | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 975ebda..2a0c405 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -93,6 +93,9 @@ def format_addr(addr): result += u":%d" % port return result +def safe_format_addr(addr): + return safe_str(format_addr(addr)) + options.facilitator_url = DEFAULT_FACILITATOR_URL options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) @@ -138,4 +141,4 @@ except Exception, e: sys.exit(1) http.close() -print "Registered \"%s\" with %s." % (safe_str(spec), options.facilitator_url) +print "Registered \"%s\" with %s." % (safe_format_addr(options.remote_addr), options.facilitator_url)

1 0

r26383: {website} add a note for win8 users so they can verify packages (website/trunk/docs/en)
by Erinn Clark 10 Oct '13

10 Oct '13

Author: erinn Date: 2013-10-10 01:17:16 +0000 (Thu, 10 Oct 2013) New Revision: 26383 Modified: website/trunk/docs/en/verifying-signatures.wml Log: add a note for win8 users so they can verify packages Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2013-10-09 05:40:12 UTC (rev 26382) +++ website/trunk/docs/en/verifying-signatures.wml 2013-10-10 01:17:16 UTC (rev 26383) @@ -73,6 +73,10 @@ you installed GnuPG with the default values, the path should be something like this: C:\Program Files\Gnu\GnuPg\gpg.exe. + Note for Windows 8 Users: Your GnuPG binary is probably + located at C:\Program Files (x86)\Gnu\GnuPg\gpg2.exe. You should replace + all of the commands below with this path instead. + Erinn Clark signs the Tor Browser Bundles. Import her key (0x416F061063FEE659) by starting cmd.exe and typing:

1 0

[flashproxy/master] IMAP4.error includes IMAP4.abort, and we want to catch both.
by dcf＠torproject.org 09 Oct '13

09 Oct '13

commit 58b97aea786eeb35a1d1b4d9270bdc28fa399dc1 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 13:39:43 2013 -0700 IMAP4.error includes IMAP4.abort, and we want to catch both. --- facilitator/facilitator-email-poller | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 0e94474..33d4ed7 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -408,7 +408,7 @@ while True: try: imap = imap_login() imap_loop(imap) - except (imaplib.IMAP4.abort, ssl.SSLError, SSL.SSLError, socket.error), e: + except (imaplib.IMAP4.error, ssl.SSLError, SSL.SSLError, socket.error), e: # Try again after a disconnection. log(u"lost server connection: %s" % str(e)) except KeyboardInterrupt:

1 0

[flashproxy/master] close and logout only if we logged in.
by dcf＠torproject.org 09 Oct '13

09 Oct '13

commit 801af81ae5311dc9cf7511996ab1a16501c0d0c5 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 13:40:05 2013 -0700 close and logout only if we logged in. I was getting a NameError referring to "imap" if the exception happened in imap_login. --- facilitator/facilitator-email-poller | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 33d4ed7..6691afc 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -407,19 +407,17 @@ login_limit = RateLimit() while True: try: imap = imap_login() - imap_loop(imap) + try: + imap_loop(imap) + except imaplib.IMAP4.error: + imap.close() + imap.logout() except (imaplib.IMAP4.error, ssl.SSLError, SSL.SSLError, socket.error), e: # Try again after a disconnection. log(u"lost server connection: %s" % str(e)) except KeyboardInterrupt: break - try: - imap.close() - imap.logout() - except (imaplib.IMAP4.abort, imaplib.IMAP4.error): - pass - # Don't reconnect too fast. t = login_limit.time_to_wait() if t > 0:

1 0

[flashproxy/master] Add kSPKIHash_GoogleG2 to the pins of flashproxy-reg-email and facilitator-email-poller.
by dcf＠torproject.org 09 Oct '13

09 Oct '13

commit 9172201adb814bf828dd67f1fd92ebf7cbce7f0f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 13:24:15 2013 -0700 Add kSPKIHash_GoogleG2 to the pins of flashproxy-reg-email and facilitator-email-poller. I for sure now see this pin using facilitator-email-poller, running from the main facilitator. May as well make it uniform everywhere. --- facilitator/facilitator-email-poller | 2 ++ flashproxy-reg-email | 2 ++ 2 files changed, 4 insertions(+) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 49af526..0e94474 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -68,6 +68,8 @@ PUBKEY_SHA1 = ( # https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_securit… # kSPKIHash_Google1024 "\x40\xc5\x40\x1d\x6f\x8c\xba\xf0\x8b\x00\xed\xef\xb1\xee\x87\xd0\x05\xb3\xb9\xcd", + # kSPKIHash_GoogleG2 + "\x43\xda\xd6\x30\xee\x53\xf8\xa9\x80\xca\x6e\xfd\x85\xf4\x6a\xa3\x79\x90\xe0\xea", ) LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 13ab5a5..3cb3c1e 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -64,6 +64,8 @@ PUBKEY_SHA1 = ( # https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_securit… # kSPKIHash_Google1024 "\x40\xc5\x40\x1d\x6f\x8c\xba\xf0\x8b\x00\xed\xef\xb1\xee\x87\xd0\x05\xb3\xb9\xcd", + # kSPKIHash_GoogleG2 + "\x43\xda\xd6\x30\xee\x53\xf8\xa9\x80\xca\x6e\xfd\x85\xf4\x6a\xa3\x79\x90\xe0\xea", ) # Registrations are encrypted with this public key before being emailed. Only

1 0

[flashproxy/master] Fix scope of SSLError.
by dcf＠torproject.org 09 Oct '13

09 Oct '13

commit df44d5a94ca30f836b06729580d4d1afec027e3d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 13:13:48 2013 -0700 Fix scope of SSLError. --- facilitator/facilitator-email-poller | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index bd70f34..49af526 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -406,7 +406,7 @@ while True: try: imap = imap_login() imap_loop(imap) - except (imaplib.IMAP4.abort, ssl.SSLError, M2Crypto.SSL.SSLError, socket.error), e: + except (imaplib.IMAP4.abort, ssl.SSLError, SSL.SSLError, socket.error), e: # Try again after a disconnection. log(u"lost server connection: %s" % str(e)) except KeyboardInterrupt:

1 0