tor-commits January 2012

tor-commits@lists.torproject.org

14 participants
852 discussions

[tor/master] Change to use SSL_state_string_long() instead of homebrew ssl_state_to_string() function.
by nickm＠torproject.org 06 Jan '12

06 Jan '12

commit d7eaa4b396c559871ef06a704304afcbc2ecebfb Author: Emile Snyder <emile.snyder(a)gmail.com> Date: Fri Jan 6 05:31:34 2012 -0800 Change to use SSL_state_string_long() instead of homebrew ssl_state_to_string() function. --- src/common/Makefile.am | 1 - src/common/tortls.c | 36 +--- src/common/tortls_states.h | 414 -------------------------------------------- 3 files changed, 9 insertions(+), 442 deletions(-) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 2920e73..04c4115 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -51,7 +51,6 @@ noinst_HEADERS = \ torint.h \ torlog.h \ tortls.h \ - tortls_states.h \ util.h common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) diff --git a/src/common/tortls.c b/src/common/tortls.c index b7cd835..81de5c1 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -237,22 +237,6 @@ static int tls_library_is_initialized = 0; #define _TOR_TLS_SYSCALL (_MIN_TOR_TLS_ERROR_VAL - 2) #define _TOR_TLS_ZERORETURN (_MIN_TOR_TLS_ERROR_VAL - 1) -#include "tortls_states.h" - -/** Return the symbolic name of an OpenSSL state. */ -static const char * -ssl_state_to_string(int ssl_state) -{ - static char buf[40]; - int i; - for (i = 0; state_map[i].name; ++i) { - if (state_map[i].state == ssl_state) - return state_map[i].name; - } - tor_snprintf(buf, sizeof(buf), "Unknown state %d", ssl_state); - return buf; -} - /** Write a description of the current state of tls into the * sz-byte buffer at buf. */ void @@ -266,7 +250,7 @@ tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz) return; } - ssl_state = ssl_state_to_string(tls->ssl->state); + ssl_state = SSL_state_string_long(tls->ssl); switch (tls->state) { #define CASE(st) case TOR_TLS_ST_##st: tortls_state = " in "#st ; break CASE(HANDSHAKE); @@ -293,10 +277,8 @@ tor_tls_log_one_error(tor_tls_t *tls, unsigned long err, { const char *state = NULL, *addr; const char *msg, *lib, *func; - int st; - st = (tls && tls->ssl) ? tls->ssl->state : -1; - state = (st>=0)?ssl_state_to_string(st):"---"; + state = (tls && tls->ssl)?SSL_state_string_long(tls->ssl):"---"; addr = tls ? tls->address : NULL; @@ -433,14 +415,14 @@ tor_tls_get_error(tor_tls_t *tls, int r, int extra, return _TOR_TLS_SYSCALL; if (r == 0) { log(severity, LD_NET, "TLS error: unexpected close while %s (%s)", - doing, ssl_state_to_string(tls->ssl->state)); + doing, SSL_state_string_long(tls->ssl)); tor_error = TOR_TLS_ERROR_IO; } else { int e = tor_socket_errno(tls->socket); log(severity, LD_NET, "TLS error: <syscall error while %s> (errno=%d: %s; state=%s)", doing, e, tor_socket_strerror(e), - ssl_state_to_string(tls->ssl->state)); + SSL_state_string_long(tls->ssl)); tor_error = tor_errno_to_tls_error(e); } tls_log_errors(tls, severity, domain, doing); @@ -449,7 +431,7 @@ tor_tls_get_error(tor_tls_t *tls, int r, int extra, if (extra&CATCH_ZERO) return _TOR_TLS_ZERORETURN; log(severity, LD_NET, "TLS connection closed while %s in state %s", - doing, ssl_state_to_string(tls->ssl->state)); + doing, SSL_state_string_long(tls->ssl)); tls_log_errors(tls, severity, domain, doing); return TOR_TLS_CLOSE; default: @@ -1350,7 +1332,7 @@ static void tor_tls_debug_state_callback(const SSL *ssl, int type, int val) { log_debug(LD_HANDSHAKE, "SSL %p is now in state %s [type=%d,val=%d].", - ssl, ssl_state_to_string(ssl->state), type, val); + ssl, SSL_state_string_long(ssl), type, val); } /** Invoked when we're accepting a connection on ssl, and the connection @@ -1755,16 +1737,16 @@ tor_tls_handshake(tor_tls_t *tls) oldstate = tls->ssl->state; if (tls->isServer) { log_debug(LD_HANDSHAKE, "About to call SSL_accept on %p (%s)", tls, - ssl_state_to_string(tls->ssl->state)); + SSL_state_string_long(tls->ssl)); r = SSL_accept(tls->ssl); } else { log_debug(LD_HANDSHAKE, "About to call SSL_connect on %p (%s)", tls, - ssl_state_to_string(tls->ssl->state)); + SSL_state_string_long(tls->ssl)); r = SSL_connect(tls->ssl); } if (oldstate != tls->ssl->state) log_debug(LD_HANDSHAKE, "After call, %p was in state %s", - tls, ssl_state_to_string(tls->ssl->state)); + tls, SSL_state_string_long(tls->ssl)); /* We need to call this here and not earlier, since OpenSSL has a penchant * for clearing its flags when you say accept or connect. */ tor_tls_unblock_renegotiation(tls); diff --git a/src/common/tortls_states.h b/src/common/tortls_states.h deleted file mode 100644 index dcff247..0000000 --- a/src/common/tortls_states.h +++ /dev/null @@ -1,414 +0,0 @@ -/* Copyright (c) 2003, Roger Dingledine - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2011, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/* Helper file: included only in tortls.c */ - -#ifndef _TORTLS_STATES_H -#define _TORTLS_STATES_H - -/* The main body of this file was mechanically generated with this - perl script: - - my %keys = (); - for $fn (@ARGV) { - open(F, $fn); - while (<F>) { - next unless /^#define ((?:SSL|DTLS)\w*_ST_\w*)/; - $keys{$1} = 1; - } - close(F); - } - for $k (sort keys %keys) { - print "#ifdef $k\n S($k),\n#endif\n" - } -*/ - -/** Mapping from allowed value of SSL.state to the name of C macro for that - * state. Used for debugging an openssl connection. */ -static const struct { int state; const char *name; } state_map[] = { -#define S(state) { state, #state } -#ifdef DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A - S(DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A), -#endif -#ifdef DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B - S(DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B), -#endif -#ifdef DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A - S(DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A), -#endif -#ifdef DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B - S(DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B), -#endif -#ifdef SSL23_ST_CR_SRVR_HELLO_A - S(SSL23_ST_CR_SRVR_HELLO_A), -#endif -#ifdef SSL23_ST_CR_SRVR_HELLO_B - S(SSL23_ST_CR_SRVR_HELLO_B), -#endif -#ifdef SSL23_ST_CW_CLNT_HELLO_A - S(SSL23_ST_CW_CLNT_HELLO_A), -#endif -#ifdef SSL23_ST_CW_CLNT_HELLO_B - S(SSL23_ST_CW_CLNT_HELLO_B), -#endif -#ifdef SSL23_ST_SR_CLNT_HELLO_A - S(SSL23_ST_SR_CLNT_HELLO_A), -#endif -#ifdef SSL23_ST_SR_CLNT_HELLO_B - S(SSL23_ST_SR_CLNT_HELLO_B), -#endif -#ifdef SSL2_ST_CLIENT_START_ENCRYPTION - S(SSL2_ST_CLIENT_START_ENCRYPTION), -#endif -#ifdef SSL2_ST_GET_CLIENT_FINISHED_A - S(SSL2_ST_GET_CLIENT_FINISHED_A), -#endif -#ifdef SSL2_ST_GET_CLIENT_FINISHED_B - S(SSL2_ST_GET_CLIENT_FINISHED_B), -#endif -#ifdef SSL2_ST_GET_CLIENT_HELLO_A - S(SSL2_ST_GET_CLIENT_HELLO_A), -#endif -#ifdef SSL2_ST_GET_CLIENT_HELLO_B - S(SSL2_ST_GET_CLIENT_HELLO_B), -#endif -#ifdef SSL2_ST_GET_CLIENT_HELLO_C - S(SSL2_ST_GET_CLIENT_HELLO_C), -#endif -#ifdef SSL2_ST_GET_CLIENT_MASTER_KEY_A - S(SSL2_ST_GET_CLIENT_MASTER_KEY_A), -#endif -#ifdef SSL2_ST_GET_CLIENT_MASTER_KEY_B - S(SSL2_ST_GET_CLIENT_MASTER_KEY_B), -#endif -#ifdef SSL2_ST_GET_SERVER_FINISHED_A - S(SSL2_ST_GET_SERVER_FINISHED_A), -#endif -#ifdef SSL2_ST_GET_SERVER_FINISHED_B - S(SSL2_ST_GET_SERVER_FINISHED_B), -#endif -#ifdef SSL2_ST_GET_SERVER_HELLO_A - S(SSL2_ST_GET_SERVER_HELLO_A), -#endif -#ifdef SSL2_ST_GET_SERVER_HELLO_B - S(SSL2_ST_GET_SERVER_HELLO_B), -#endif -#ifdef SSL2_ST_GET_SERVER_VERIFY_A - S(SSL2_ST_GET_SERVER_VERIFY_A), -#endif -#ifdef SSL2_ST_GET_SERVER_VERIFY_B - S(SSL2_ST_GET_SERVER_VERIFY_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_A - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_B - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_C - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_C), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_D - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_D), -#endif -#ifdef SSL2_ST_SEND_CLIENT_FINISHED_A - S(SSL2_ST_SEND_CLIENT_FINISHED_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_FINISHED_B - S(SSL2_ST_SEND_CLIENT_FINISHED_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_HELLO_A - S(SSL2_ST_SEND_CLIENT_HELLO_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_HELLO_B - S(SSL2_ST_SEND_CLIENT_HELLO_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_MASTER_KEY_A - S(SSL2_ST_SEND_CLIENT_MASTER_KEY_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_MASTER_KEY_B - S(SSL2_ST_SEND_CLIENT_MASTER_KEY_B), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_A - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_A), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_B - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_B), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_C - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_C), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_D - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_D), -#endif -#ifdef SSL2_ST_SEND_SERVER_FINISHED_A - S(SSL2_ST_SEND_SERVER_FINISHED_A), -#endif -#ifdef SSL2_ST_SEND_SERVER_FINISHED_B - S(SSL2_ST_SEND_SERVER_FINISHED_B), -#endif -#ifdef SSL2_ST_SEND_SERVER_HELLO_A - S(SSL2_ST_SEND_SERVER_HELLO_A), -#endif -#ifdef SSL2_ST_SEND_SERVER_HELLO_B - S(SSL2_ST_SEND_SERVER_HELLO_B), -#endif -#ifdef SSL2_ST_SEND_SERVER_VERIFY_A - S(SSL2_ST_SEND_SERVER_VERIFY_A), -#endif -#ifdef SSL2_ST_SEND_SERVER_VERIFY_B - S(SSL2_ST_SEND_SERVER_VERIFY_B), -#endif -#ifdef SSL2_ST_SEND_SERVER_VERIFY_C - S(SSL2_ST_SEND_SERVER_VERIFY_C), -#endif -#ifdef SSL2_ST_SERVER_START_ENCRYPTION - S(SSL2_ST_SERVER_START_ENCRYPTION), -#endif -#ifdef SSL2_ST_X509_GET_CLIENT_CERTIFICATE - S(SSL2_ST_X509_GET_CLIENT_CERTIFICATE), -#endif -#ifdef SSL2_ST_X509_GET_SERVER_CERTIFICATE - S(SSL2_ST_X509_GET_SERVER_CERTIFICATE), -#endif -#ifdef SSL3_ST_CR_CERT_A - S(SSL3_ST_CR_CERT_A), -#endif -#ifdef SSL3_ST_CR_CERT_B - S(SSL3_ST_CR_CERT_B), -#endif -#ifdef SSL3_ST_CR_CERT_REQ_A - S(SSL3_ST_CR_CERT_REQ_A), -#endif -#ifdef SSL3_ST_CR_CERT_REQ_B - S(SSL3_ST_CR_CERT_REQ_B), -#endif -#ifdef SSL3_ST_CR_CERT_STATUS_A - S(SSL3_ST_CR_CERT_STATUS_A), -#endif -#ifdef SSL3_ST_CR_CERT_STATUS_B - S(SSL3_ST_CR_CERT_STATUS_B), -#endif -#ifdef SSL3_ST_CR_CHANGE_A - S(SSL3_ST_CR_CHANGE_A), -#endif -#ifdef SSL3_ST_CR_CHANGE_B - S(SSL3_ST_CR_CHANGE_B), -#endif -#ifdef SSL3_ST_CR_FINISHED_A - S(SSL3_ST_CR_FINISHED_A), -#endif -#ifdef SSL3_ST_CR_FINISHED_B - S(SSL3_ST_CR_FINISHED_B), -#endif -#ifdef SSL3_ST_CR_KEY_EXCH_A - S(SSL3_ST_CR_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_CR_KEY_EXCH_B - S(SSL3_ST_CR_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_CR_SESSION_TICKET_A - S(SSL3_ST_CR_SESSION_TICKET_A), -#endif -#ifdef SSL3_ST_CR_SESSION_TICKET_B - S(SSL3_ST_CR_SESSION_TICKET_B), -#endif -#ifdef SSL3_ST_CR_SRVR_DONE_A - S(SSL3_ST_CR_SRVR_DONE_A), -#endif -#ifdef SSL3_ST_CR_SRVR_DONE_B - S(SSL3_ST_CR_SRVR_DONE_B), -#endif -#ifdef SSL3_ST_CR_SRVR_HELLO_A - S(SSL3_ST_CR_SRVR_HELLO_A), -#endif -#ifdef SSL3_ST_CR_SRVR_HELLO_B - S(SSL3_ST_CR_SRVR_HELLO_B), -#endif -#ifdef SSL3_ST_CW_CERT_A - S(SSL3_ST_CW_CERT_A), -#endif -#ifdef SSL3_ST_CW_CERT_B - S(SSL3_ST_CW_CERT_B), -#endif -#ifdef SSL3_ST_CW_CERT_C - S(SSL3_ST_CW_CERT_C), -#endif -#ifdef SSL3_ST_CW_CERT_D - S(SSL3_ST_CW_CERT_D), -#endif -#ifdef SSL3_ST_CW_CERT_VRFY_A - S(SSL3_ST_CW_CERT_VRFY_A), -#endif -#ifdef SSL3_ST_CW_CERT_VRFY_B - S(SSL3_ST_CW_CERT_VRFY_B), -#endif -#ifdef SSL3_ST_CW_CHANGE_A - S(SSL3_ST_CW_CHANGE_A), -#endif -#ifdef SSL3_ST_CW_CHANGE_B - S(SSL3_ST_CW_CHANGE_B), -#endif -#ifdef SSL3_ST_CW_CLNT_HELLO_A - S(SSL3_ST_CW_CLNT_HELLO_A), -#endif -#ifdef SSL3_ST_CW_CLNT_HELLO_B - S(SSL3_ST_CW_CLNT_HELLO_B), -#endif -#ifdef SSL3_ST_CW_FINISHED_A - S(SSL3_ST_CW_FINISHED_A), -#endif -#ifdef SSL3_ST_CW_FINISHED_B - S(SSL3_ST_CW_FINISHED_B), -#endif -#ifdef SSL3_ST_CW_FLUSH - S(SSL3_ST_CW_FLUSH), -#endif -#ifdef SSL3_ST_CW_KEY_EXCH_A - S(SSL3_ST_CW_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_CW_KEY_EXCH_B - S(SSL3_ST_CW_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_SR_CERT_A - S(SSL3_ST_SR_CERT_A), -#endif -#ifdef SSL3_ST_SR_CERT_B - S(SSL3_ST_SR_CERT_B), -#endif -#ifdef SSL3_ST_SR_CERT_VRFY_A - S(SSL3_ST_SR_CERT_VRFY_A), -#endif -#ifdef SSL3_ST_SR_CERT_VRFY_B - S(SSL3_ST_SR_CERT_VRFY_B), -#endif -#ifdef SSL3_ST_SR_CHANGE_A - S(SSL3_ST_SR_CHANGE_A), -#endif -#ifdef SSL3_ST_SR_CHANGE_B - S(SSL3_ST_SR_CHANGE_B), -#endif -#ifdef SSL3_ST_SR_CLNT_HELLO_A - S(SSL3_ST_SR_CLNT_HELLO_A), -#endif -#ifdef SSL3_ST_SR_CLNT_HELLO_B - S(SSL3_ST_SR_CLNT_HELLO_B), -#endif -#ifdef SSL3_ST_SR_CLNT_HELLO_C - S(SSL3_ST_SR_CLNT_HELLO_C), -#endif -#ifdef SSL3_ST_SR_FINISHED_A - S(SSL3_ST_SR_FINISHED_A), -#endif -#ifdef SSL3_ST_SR_FINISHED_B - S(SSL3_ST_SR_FINISHED_B), -#endif -#ifdef SSL3_ST_SR_KEY_EXCH_A - S(SSL3_ST_SR_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_SR_KEY_EXCH_B - S(SSL3_ST_SR_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_SW_CERT_A - S(SSL3_ST_SW_CERT_A), -#endif -#ifdef SSL3_ST_SW_CERT_B - S(SSL3_ST_SW_CERT_B), -#endif -#ifdef SSL3_ST_SW_CERT_REQ_A - S(SSL3_ST_SW_CERT_REQ_A), -#endif -#ifdef SSL3_ST_SW_CERT_REQ_B - S(SSL3_ST_SW_CERT_REQ_B), -#endif -#ifdef SSL3_ST_SW_CERT_STATUS_A - S(SSL3_ST_SW_CERT_STATUS_A), -#endif -#ifdef SSL3_ST_SW_CERT_STATUS_B - S(SSL3_ST_SW_CERT_STATUS_B), -#endif -#ifdef SSL3_ST_SW_CHANGE_A - S(SSL3_ST_SW_CHANGE_A), -#endif -#ifdef SSL3_ST_SW_CHANGE_B - S(SSL3_ST_SW_CHANGE_B), -#endif -#ifdef SSL3_ST_SW_FINISHED_A - S(SSL3_ST_SW_FINISHED_A), -#endif -#ifdef SSL3_ST_SW_FINISHED_B - S(SSL3_ST_SW_FINISHED_B), -#endif -#ifdef SSL3_ST_SW_FLUSH - S(SSL3_ST_SW_FLUSH), -#endif -#ifdef SSL3_ST_SW_HELLO_REQ_A - S(SSL3_ST_SW_HELLO_REQ_A), -#endif -#ifdef SSL3_ST_SW_HELLO_REQ_B - S(SSL3_ST_SW_HELLO_REQ_B), -#endif -#ifdef SSL3_ST_SW_HELLO_REQ_C - S(SSL3_ST_SW_HELLO_REQ_C), -#endif -#ifdef SSL3_ST_SW_KEY_EXCH_A - S(SSL3_ST_SW_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_SW_KEY_EXCH_B - S(SSL3_ST_SW_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_SW_SESSION_TICKET_A - S(SSL3_ST_SW_SESSION_TICKET_A), -#endif -#ifdef SSL3_ST_SW_SESSION_TICKET_B - S(SSL3_ST_SW_SESSION_TICKET_B), -#endif -#ifdef SSL3_ST_SW_SRVR_DONE_A - S(SSL3_ST_SW_SRVR_DONE_A), -#endif -#ifdef SSL3_ST_SW_SRVR_DONE_B - S(SSL3_ST_SW_SRVR_DONE_B), -#endif -#ifdef SSL3_ST_SW_SRVR_HELLO_A - S(SSL3_ST_SW_SRVR_HELLO_A), -#endif -#ifdef SSL3_ST_SW_SRVR_HELLO_B - S(SSL3_ST_SW_SRVR_HELLO_B), -#endif -#ifdef SSL_ST_ACCEPT - S(SSL_ST_ACCEPT), -#endif -#ifdef SSL_ST_BEFORE - S(SSL_ST_BEFORE), -#endif -#ifdef SSL_ST_CONNECT - S(SSL_ST_CONNECT), -#endif -#ifdef SSL_ST_INIT - S(SSL_ST_INIT), -#endif -#ifdef SSL_ST_MASK - S(SSL_ST_MASK), -#endif -#ifdef SSL_ST_OK - S(SSL_ST_OK), -#endif -#ifdef SSL_ST_READ_BODY - S(SSL_ST_READ_BODY), -#endif -#ifdef SSL_ST_READ_DONE - S(SSL_ST_READ_DONE), -#endif -#ifdef SSL_ST_READ_HEADER - S(SSL_ST_READ_HEADER), -#endif -#ifdef SSL_ST_RENEGOTIATE - S(SSL_ST_RENEGOTIATE), -#endif - { 0, NULL } -}; - -#endif -

1 0

[tor/master] Add a changes file for bug4563
by nickm＠torproject.org 06 Jan '12

06 Jan '12

commit 37c90319e2ac0ecb71c9986ff55d07fe3da86ee6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 6 11:42:00 2012 -0500 Add a changes file for bug4563 --- changes/bug4653 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4653 b/changes/bug4653 new file mode 100644 index 0000000..3c0596f --- /dev/null +++ b/changes/bug4653 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Use OpenSSL's built-in SSL_state_string_long() instead of our + own homebrewed ssl_state_to_string() replacement. Patch from + Emile Snyder. Fixes bug 4653.

1 0

[vidalia/master] Remove call to validateBridge
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 4f0ebe5104121f3da84fc8730a9df2a0f3285365 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 12:47:02 2012 -0300 Remove call to validateBridge --- src/vidalia/config/NetworkPage.cpp | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index c51d1b6..b40cbdd 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -387,9 +387,6 @@ NetworkPage::bridgeRequestFinished(const QStringList &bridges) QString normalized; foreach (QString bridge, bridges) { - if (! validateBridge(bridge, &normalized)) - continue; - QString address = normalized.split(" ").at(0); if (ui.listBridges->findItems(address, Qt::MatchContains).isEmpty()) { ui.listBridges->addItem(normalized);

1 0

[vidalia/alpha] Remove call to validateBridge
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 9ba8c114b1575a6914cdb79830df47caf91b2a93 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 12:47:02 2012 -0300 Remove call to validateBridge --- src/vidalia/config/NetworkPage.cpp | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index c51d1b6..b40cbdd 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -387,9 +387,6 @@ NetworkPage::bridgeRequestFinished(const QStringList &bridges) QString normalized; foreach (QString bridge, bridges) { - if (! validateBridge(bridge, &normalized)) - continue; - QString address = normalized.split(" ").at(0); if (ui.listBridges->findItems(address, Qt::MatchContains).isEmpty()) { ui.listBridges->addItem(normalized);

1 0

[vidalia/master] Delegate bridge line validation to Tor
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 9508770e7465997654b1b8a64477447449a0795d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:47:07 2012 -0300 Delegate bridge line validation to Tor --- changes/newBridgeLines | 3 ++ src/vidalia/config/NetworkPage.cpp | 62 ++---------------------------------- src/vidalia/config/NetworkPage.h | 7 ---- 3 files changed, 6 insertions(+), 66 deletions(-) diff --git a/changes/newBridgeLines b/changes/newBridgeLines new file mode 100644 index 0000000..0834912 --- /dev/null +++ b/changes/newBridgeLines @@ -0,0 +1,3 @@ + o Vidalia only validates IPv4 bridge lines. IPv6 bridges are now + available, and there will be pluggable transport bridge lines. So + the validation is now delegated to Tor through SETCONF. \ No newline at end of file diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index e67686c..c51d1b6 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -122,74 +122,18 @@ NetworkPage::onLinkActivated(const QString &url) emit helpRequested(url); } -/** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ -bool -NetworkPage::validateBridge(const QString &bridge, QString *out) -{ - QString temp = bridge; - if (temp.startsWith("bridge ", Qt::CaseInsensitive)) - temp = temp.remove(0, 7); /* remove "bridge " */ - - QStringList parts = temp.split(" ", QString::SkipEmptyParts); - if (parts.isEmpty()) - return false; - - QString s = parts.at(0); - QRegExp re("(\\d{1,3}\\.){3}\\d{1,3}(:\\d{1,5})?"); - if (re.exactMatch(s)) { - if (s.endsWith(":")) - return false; - - int index = s.indexOf(":"); - QString host = s.mid(0, index); - if (QHostAddress(host).isNull() - || QHostAddress(host).protocol() != QAbstractSocket::IPv4Protocol) { - return false; - } - if (index > 0) { - QString port = s.mid(index + 1); - if (port.toUInt() < 1 || port.toUInt() > 65535) - return false; - } - - temp = s; - if (parts.size() > 1) { - QString fp = static_cast<QStringList>(parts.mid(1)).join(""); - if (fp.length() != 40 || !string_is_hex(fp)) - return false; - temp += " " + fp.toUpper(); - } - } else { - return false; - } - *out = temp; - return true; -} - /** Adds a bridge to the bridge list box. */ void NetworkPage::addBridge() { - QString bridge; QString input = ui.lineBridge->text().trimmed(); if (input.isEmpty()) return; - if (!validateBridge(input, &bridge)) { - VMessageBox::warning(this, - tr("Invalid Bridge"), - tr("The specified bridge identifier is not valid."), - VMessageBox::Ok|VMessageBox::Default); - return; - } - if (!ui.listBridges->findItems(bridge, Qt::MatchFixedString).isEmpty()) + if (!ui.listBridges->findItems(input, Qt::MatchFixedString).isEmpty()) return; /* duplicate bridge */ - ui.listBridges->addItem(bridge); + ui.listBridges->addItem(input); ui.lineBridge->clear(); } @@ -319,7 +263,7 @@ NetworkPage::save(QString &errmsg) if (ui.chkUseBridges->isChecked()) { if (ui.listBridges->count() < 1) { - errmsg = tr("You must specify one or more briges."); + errmsg = tr("You must specify one or more bridges."); return false; } } diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h index c198573..2193be7 100644 --- a/src/vidalia/config/NetworkPage.h +++ b/src/vidalia/config/NetworkPage.h @@ -81,13 +81,6 @@ private slots: void proxyTypeChanged(int selection); private: - /** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ - bool validateBridge(const QString &bridge, QString *out); - /** Helper class used to facilitate downloading one or more bridge * addresses. */ BridgeDownloader* _bridgeDownloader;

1 0

[vidalia/alpha] Make dist-osx work on case sensitive OSX
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 40f2985fccfe02e201bb04adf61635e59fa1e8ea Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Jan 4 06:55:10 2012 -0300 Make dist-osx work on case sensitive OSX --- pkg/osx/CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index 0dbb1df..eca7049 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -55,7 +55,7 @@ add_custom_target(dist-osx --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/vidalia-${VERSION}-${DMG_ARCH}.dmg --sourcefile --volname "Vidalia ${VERSION}" - --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/Vidalia.icns + --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/vidalia.icns --symlink "/Applications:/Drag to here" --mkdir /.background --copy ${CMAKE_CURRENT_SOURCE_DIR}/background.png:/.background/ @@ -91,7 +91,7 @@ if (TOR_SOURCE_DIR AND SCRIPT_DIR) --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/${bundle_DMG} --sourcefile --volname "Vidalia Bundle ${VERSION}" - --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/Vidalia.icns + --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/vidalia.icns --symlink "/Applications:/Drag to here" --mkdir /.background --copy ${CMAKE_CURRENT_SOURCE_DIR}/bundle-background.png:/.background/

1 0

[vidalia/alpha] Delegate bridge line validation to Tor
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit d661bfbe24af322be97f8c6bcc7797562a08f0a8 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:47:07 2012 -0300 Delegate bridge line validation to Tor --- changes/newBridgeLines | 3 ++ src/vidalia/config/NetworkPage.cpp | 62 ++---------------------------------- src/vidalia/config/NetworkPage.h | 7 ---- 3 files changed, 6 insertions(+), 66 deletions(-) diff --git a/changes/newBridgeLines b/changes/newBridgeLines new file mode 100644 index 0000000..0834912 --- /dev/null +++ b/changes/newBridgeLines @@ -0,0 +1,3 @@ + o Vidalia only validates IPv4 bridge lines. IPv6 bridges are now + available, and there will be pluggable transport bridge lines. So + the validation is now delegated to Tor through SETCONF. \ No newline at end of file diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index e67686c..c51d1b6 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -122,74 +122,18 @@ NetworkPage::onLinkActivated(const QString &url) emit helpRequested(url); } -/** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ -bool -NetworkPage::validateBridge(const QString &bridge, QString *out) -{ - QString temp = bridge; - if (temp.startsWith("bridge ", Qt::CaseInsensitive)) - temp = temp.remove(0, 7); /* remove "bridge " */ - - QStringList parts = temp.split(" ", QString::SkipEmptyParts); - if (parts.isEmpty()) - return false; - - QString s = parts.at(0); - QRegExp re("(\\d{1,3}\\.){3}\\d{1,3}(:\\d{1,5})?"); - if (re.exactMatch(s)) { - if (s.endsWith(":")) - return false; - - int index = s.indexOf(":"); - QString host = s.mid(0, index); - if (QHostAddress(host).isNull() - || QHostAddress(host).protocol() != QAbstractSocket::IPv4Protocol) { - return false; - } - if (index > 0) { - QString port = s.mid(index + 1); - if (port.toUInt() < 1 || port.toUInt() > 65535) - return false; - } - - temp = s; - if (parts.size() > 1) { - QString fp = static_cast<QStringList>(parts.mid(1)).join(""); - if (fp.length() != 40 || !string_is_hex(fp)) - return false; - temp += " " + fp.toUpper(); - } - } else { - return false; - } - *out = temp; - return true; -} - /** Adds a bridge to the bridge list box. */ void NetworkPage::addBridge() { - QString bridge; QString input = ui.lineBridge->text().trimmed(); if (input.isEmpty()) return; - if (!validateBridge(input, &bridge)) { - VMessageBox::warning(this, - tr("Invalid Bridge"), - tr("The specified bridge identifier is not valid."), - VMessageBox::Ok|VMessageBox::Default); - return; - } - if (!ui.listBridges->findItems(bridge, Qt::MatchFixedString).isEmpty()) + if (!ui.listBridges->findItems(input, Qt::MatchFixedString).isEmpty()) return; /* duplicate bridge */ - ui.listBridges->addItem(bridge); + ui.listBridges->addItem(input); ui.lineBridge->clear(); } @@ -319,7 +263,7 @@ NetworkPage::save(QString &errmsg) if (ui.chkUseBridges->isChecked()) { if (ui.listBridges->count() < 1) { - errmsg = tr("You must specify one or more briges."); + errmsg = tr("You must specify one or more bridges."); return false; } } diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h index c198573..2193be7 100644 --- a/src/vidalia/config/NetworkPage.h +++ b/src/vidalia/config/NetworkPage.h @@ -81,13 +81,6 @@ private slots: void proxyTypeChanged(int selection); private: - /** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ - bool validateBridge(const QString &bridge, QString *out); - /** Helper class used to facilitate downloading one or more bridge * addresses. */ BridgeDownloader* _bridgeDownloader;

1 0

[vidalia/alpha] Properly package qtscriptgenerator extensions
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 3d4cc22f3a09ce753ece81f46dc5de933d65b0a7 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Oct 31 22:01:08 2011 -0300 Properly package qtscriptgenerator extensions --- cmake/VidaliaMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++ pkg/osx/CMakeLists.txt | 23 ++++++++++++++++++----- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/cmake/VidaliaMacros.cmake b/cmake/VidaliaMacros.cmake index 7e468b2..5d7897c 100644 --- a/cmake/VidaliaMacros.cmake +++ b/cmake/VidaliaMacros.cmake @@ -172,6 +172,44 @@ endmacro(VIDALIA_GET_TOR_VERSION) if (APPLE) include(${Vidalia_SOURCE_DIR}/cmake/ParseArgumentsMacro.cmake) + macro(VIDALIA_COPY_PLUGINS) + parse_arguments(COPY_PLUGINS "DIR;APP_BUNDLE;FRAMEWORKS;COMPONENTS;TARGET" "" ${ARGN}) + + set(outdir "${COPY_PLUGINS_APP_BUNDLE}/Contents/MacOS/script/") + foreach(component ${COPY_PLUGINS_COMPONENTS}) + add_custom_command(TARGET ${COPY_PLUGINS_TARGET} + COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir} + COMMAND cp + ${COPY_PLUGINS_DIR}/libqtscript_${component}.dylib + ${outdir}/libqtscript_${component}.dylib + ) + endforeach(component) + endmacro(VIDALIA_COPY_PLUGINS) + + macro(VIDALIA_DO_PLUGINS) + parse_arguments(DO_PLUGINS "DIR;APP_BUNDLE;FRAMEWORKS;COMPONENTS;TARGET" "" ${ARGN}) + + set(outdir "${DO_PLUGINS_APP_BUNDLE}/Contents/MacOS/script/") + + foreach(component ${DO_PLUGINS_COMPONENTS}) + foreach(framework ${DO_PLUGINS_FRAMEWORKS}) + add_custom_command(TARGET ${DO_PLUGINS_TARGET} + COMMAND install_name_tool -change + ${framework}.framework/Versions/4/${framework} + @executable_path/../Frameworks/${framework}.framework/Versions/4/${framework} + ${outdir}/libqtscript_${component}.dylib + ) + endforeach(framework) + add_custom_command(TARGET ${DO_PLUGINS_TARGET} + COMMAND install_name_tool -id + @executable_path/script/libqtscript_${component}.dylib + ${outdir}/libqtscript_${component}.dylib + ) + endforeach(component) + + + endmacro(VIDALIA_DO_PLUGINS) + ## Calls the install_name_tool utility to change the dependent shared ## library or framework install name to the corresponding library or ## framework that was previously installed in the .app bundle using diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index 85e81d5..0dbb1df 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -15,6 +15,19 @@ set(VIDALIA_APP_BUNDLE_ROOT ${Vidalia_BINARY_DIR}/src/vidalia/Vidalia.app) get_target_property(VIDALIA_EXECUTABLE Vidalia LOCATION) add_custom_target(dist-osx-libraries DEPENDS Vidalia) if (QT_USE_FRAMEWORKS) + vidalia_copy_plugins( + TARGET dist-osx-libraries + DIR ${SCRIPT_DIR} + APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} + COMPONENTS core gui network uitools xml + ) + vidalia_do_plugins( + TARGET dist-osx-libraries + DIR ${SCRIPT_DIR} + APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} + FRAMEWORKS QtGui QtCore QtScript QtNetwork QtXml + COMPONENTS core gui network uitools xml + ) if (USE_MARBLE) vidalia_install_dylib(MarbleWidget TARGET dist-osx-libraries @@ -60,7 +73,7 @@ add_custom_target(dist-osx ) add_dependencies(dist-osx dist-osx-libraries) -if (TOR_SOURCE_DIR) +if (TOR_SOURCE_DIR AND SCRIPT_DIR) get_filename_component(TOR_SOURCE_DIR ${TOR_SOURCE_DIR} ABSOLUTE) ## Determine Tor's version string used to build the .dmg filename @@ -109,21 +122,21 @@ if (TOR_SOURCE_DIR) VERBATIM ) add_dependencies(dist-osx-split-bundle dist-osx-bundle) -else(TOR_SOURCE_DIR) +else(TOR_SOURCE_DIR AND SCRIPT_DIR) message("-- Skipping dist-osx-bundle build target") add_custom_target(dist-osx-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-bundle target is not configured." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR CMake variables." + "!! You must set the -DTOR_SOURCE_DIR and -DSCRIPT_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) add_custom_target(dist-osx-split-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-split-bundle target is not configured. Quitting." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR CMake variables." + "!! You must set the -DTOR_SOURCE_DIR and -DSCRIPT_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) -endif(TOR_SOURCE_DIR) +endif(TOR_SOURCE_DIR AND SCRIPT_DIR)

1 0

[vidalia/alpha] Merge branch 'dist-osx' into alpha
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 1fbfcbde24a6834fac1bc6ba1224f1efa69ef67c Merge: d661bfb 3a1d2fa Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:55:40 2012 -0300 Merge branch 'dist-osx' into alpha changes/newDistOSX | 3 + cmake/VidaliaMacros.cmake | 38 ++++++++++++++++ pkg/osx/CMakeLists.txt | 108 ++++++++++----------------------------------- 3 files changed, 64 insertions(+), 85 deletions(-)

1 0

[vidalia/alpha] Add changes file
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 3a1d2fa454daa12186d35f16df404d9ad441c108 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:55:01 2012 -0300 Add changes file --- changes/newDistOSX | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/newDistOSX b/changes/newDistOSX new file mode 100644 index 0000000..de1c149 --- /dev/null +++ b/changes/newDistOSX @@ -0,0 +1,3 @@ + o Improve dist-osx* targets to be able to distribute qtscript + extensions properly, and also handle deploying Qt with the + macdeployqt tool instead of a macro. \ No newline at end of file

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2012