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

[onionoo/master] Fix searching by hashed fingerprint.
by karsten＠torproject.org 25 Apr '13

25 Apr '13

commit b30bb951cb3e1d9b1bc3cfc479ef4aadf8bca834 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 25 08:49:05 2013 +0200 Fix searching by hashed fingerprint. We support searches for relays by hashed fingerprint and for bridges by hashed hashed fingerprint. The reason is that applications should always hash full fingerprints in order not to accidentally leak non-hashed bridge fingerprints. However, the spec is vague about searching for beginnings of hashed relay fingerprints and hashed hashed bridge fingerprints. The current code did not support those, but it should. This commit changes that. --- src/org/torproject/onionoo/ResourceServlet.java | 24 ++++++++-------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 5854cb7..8c0b625 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -606,15 +606,7 @@ public class ResourceServlet extends HttpServlet { private void filterBySearchTerms(Map<String, String> filteredRelays, Map<String, String> filteredBridges, String[] searchTerms) { for (String searchTerm : searchTerms) { - if (searchTerm.startsWith("$") && searchTerm.length() == 41) { - this.filterByFingerprint(filteredRelays, filteredBridges, - searchTerm.substring(1).toUpperCase()); - } else if (!searchTerm.startsWith("$") && searchTerm.length() == 40) { - this.filterByFingerprint(filteredRelays, filteredBridges, - searchTerm.toUpperCase()); - } else { - filterBySearchTerm(filteredRelays, filteredBridges, searchTerm); - } + filterBySearchTerm(filteredRelays, filteredBridges, searchTerm); } } @@ -622,6 +614,7 @@ public class ResourceServlet extends HttpServlet { Map<String, String> filteredBridges, String searchTerm) { Set<String> removeRelays = new HashSet<String>(); for (Map.Entry<String, String> e : filteredRelays.entrySet()) { + String fingerprint = e.getKey(); String line = e.getValue(); boolean lineMatches = false; String nickname = "unnamed"; @@ -631,15 +624,15 @@ public class ResourceServlet extends HttpServlet { } if (searchTerm.startsWith("$")) { /* Search is for $-prefixed fingerprint. */ - if (line.contains("\"f\":\"" - + searchTerm.substring(1).toUpperCase())) { + if (fingerprint.startsWith( + searchTerm.substring(1).toUpperCase())) { /* $-prefixed fingerprint matches. */ lineMatches = true; } } else if (nickname.contains(searchTerm.toLowerCase())) { /* Nickname matches. */ lineMatches = true; - } else if (line.contains("\"f\":\"" + searchTerm.toUpperCase())) { + } else if (fingerprint.startsWith(searchTerm.toUpperCase())) { /* Non-$-prefixed fingerprint matches. */ lineMatches = true; } else if (line.substring(line.indexOf("\"a\":[")).contains("\"" @@ -656,6 +649,7 @@ public class ResourceServlet extends HttpServlet { } Set<String> removeBridges = new HashSet<String>(); for (Map.Entry<String, String> e : filteredBridges.entrySet()) { + String hashedFingerprint = e.getKey(); String line = e.getValue(); boolean lineMatches = false; String nickname = "unnamed"; @@ -665,15 +659,15 @@ public class ResourceServlet extends HttpServlet { } if (searchTerm.startsWith("$")) { /* Search is for $-prefixed hashed fingerprint. */ - if (line.contains("\"h\":\"" - + searchTerm.substring(1).toUpperCase())) { + if (hashedFingerprint.startsWith( + searchTerm.substring(1).toUpperCase())) { /* $-prefixed hashed fingerprint matches. */ lineMatches = true; } } else if (nickname.contains(searchTerm.toLowerCase())) { /* Nickname matches. */ lineMatches = true; - } else if (line.contains("\"h\":\"" + searchTerm.toUpperCase())) { + } else if (hashedFingerprint.startsWith(searchTerm.toUpperCase())) { /* Non-$-prefixed hashed fingerprint matches. */ lineMatches = true; }

1 0

[tlsdate/master] Add note about GNU/kFreeBSD
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit b2028d788847d9e93b09e6e8723a67eec3194d07 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 23:19:16 2013 -0700 Add note about GNU/kFreeBSD --- INSTALL | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 07bdcd9..e085656 100644 --- a/INSTALL +++ b/INSTALL @@ -16,12 +16,13 @@ tlsdate should build and work on the following Operating Systems: Gentoo 20130413 DragonFly BSD 3.3-DEVELOPMENT -tlsdate should build and may work on the following Operating Systems: +tlsdate should build and might even work on the following Operating Systems: Win32 with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3 Win32 with MinGW Haiku r1alpha4 GNU/Hurd GNU-Mach 1.3.99-486-dbg/Hurd-0.3 + GNU/kFreeBSD asdfasdf 8.2-1-amd64 Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for

1 0

[tlsdate/master] For now we TARGET_OS_FREEBSD if we would also target TARGET_OS_GNUKFREEBSD
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 57fd73723bf863d08fd0a4b264818918d3284433 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 23:27:32 2013 -0700 For now we TARGET_OS_FREEBSD if we would also target TARGET_OS_GNUKFREEBSD --- m4/ax_platform.m4 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 6e9b20d..4fcccb6 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -61,6 +61,8 @@ AC_DEFINE([TARGET_OS_FREEBSD],[1],[Whether we are building for FreeBSD])], [*kfreebsd*-gnu], [TARGET_OS_GNUKFREEBSD="true" + TARGET_OS_FREEBSD="true" + AC_DEFINE([TARGET_OS_FREEBSD],[1],[Whether we are building for FreeBSD]) AC_DEFINE([TARGET_OS_GNUKFREEBSD],[1],[Whether we are building for GNU/kFreeBSD])], [*netbsd*], [TARGET_OS_NETBSD="true"

1 0

[tlsdate/master] Add TARGET_OS_GNUKFREEBSD
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 7358400caf8bd73b8e0ef3b4206eaca55a6c8448 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 23:22:49 2013 -0700 Add TARGET_OS_GNUKFREEBSD --- m4/ax_platform.m4 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index e5baba5..6e9b20d 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -59,6 +59,9 @@ [*freebsd*], [TARGET_OS_FREEBSD="true" AC_DEFINE([TARGET_OS_FREEBSD],[1],[Whether we are building for FreeBSD])], + [*kfreebsd*-gnu], + [TARGET_OS_GNUKFREEBSD="true" + AC_DEFINE([TARGET_OS_GNUKFREEBSD],[1],[Whether we are building for GNU/kFreeBSD])], [*netbsd*], [TARGET_OS_NETBSD="true" AC_DEFINE([TARGET_OS_NETBSD],[1],[Whether we are building for NetBSD])], @@ -90,6 +93,7 @@ AM_CONDITIONAL([TARGET_GNUHURD],[test "x${TARGET_OS_GNUHURD}" = "xtrue"]) AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_OS_LINUX}" = "xtrue"]) AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"]) + AM_CONDITIONAL([TARGET_GNUKFREEBSD],[test "x${TARGET_OS_GNUKFREEBSD}" = "xtrue"]) AM_CONDITIONAL([TARGET_NETBSD],[test "x${TARGET_OS_NETBSD}" = "xtrue"]) AM_CONDITIONAL([TARGET_OPENBSD],[test "x${TARGET_OS_OPENBSD}" = "xtrue"]) AM_CONDITIONAL([TARGET_DRAGONFLYBSD],[test "x${TARGET_OS_DRAGONFLYBSD}" = "xtrue"])

1 0

[tlsdate/master] On GNU/Hurd now use a platform specific interface
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 6c8d23505b1f08d2dee13bef8a6f75d89b8917d3 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 22:08:30 2013 -0700 On GNU/Hurd now use a platform specific interface --- src/compat/include.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/compat/include.am b/src/compat/include.am index 55b6218..f499c70 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -41,7 +41,7 @@ endif endif if TARGET_GNUHURD -src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-hurd.c endif if TARGET_CYGWIN

1 0

[tlsdate/master] fork clock-linux.c for GNU/Hurd
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 691d6f0b8712ce24e826bd39e6beddd51e403c71 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 22:06:48 2013 -0700 fork clock-linux.c for GNU/Hurd --- src/compat/clock-hurd.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/src/compat/clock-hurd.c b/src/compat/clock-hurd.c new file mode 100644 index 0000000..3d62068 --- /dev/null +++ b/src/compat/clock-hurd.c @@ -0,0 +1,59 @@ +/* Copyright (c) 2012, David Goulet <dgoulet(a)ev0ke.net> + * Jacob Appelbaum + * Copyright (c) 2012, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file clock-linux.c + * \brief Contains clock primitives for GNU/Linux OS + **/ + +#include "config.h" + +#include <assert.h> + +#include "src/compat/clock.h" + +/** + * Get current real time value and store it into time. + * + * @param time where the current time is stored + * @return clock_gettime syscall return value + */ +int clock_get_real_time(struct tlsdate_time *time) +{ + /* Safety net */ + assert(time); + + return clock_gettime(CLOCK_REALTIME, &time->tp); +} + +/** + * Set current real time clock using time. + * + * @param time where the current time to set is stored + * @return clock_settime syscall return value + */ +int clock_set_real_time(const struct tlsdate_time *time) +{ + /* Safety net */ + assert(time); + + return clock_settime(CLOCK_REALTIME, &time->tp); +} + +/** + * Init a tlsdate_time structure. + * + * @param sec is the seconds + * @param nsec is the nanoseconds + */ +void clock_init_time(struct tlsdate_time *time, time_t sec, + long nsec) +{ + /* Safety net */ + assert(time); + + time->tp.tv_sec = sec; + time->tp.tv_nsec = nsec; +}

1 0

[tlsdate/master] Add GNU/Hurd configure extras for -ltr
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit e69e044fe47e75e9b0793ab5f601a7f368da5733 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 23:16:58 2013 -0700 Add GNU/Hurd configure extras for -ltr --- configure.ac | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 182bf08..ca81844 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,25 @@ case "$host" in ;; esac ;; + *-gnu0.*) + dnl This is a generic catch for GNU/Hurd variants + dnl This likely needs to be tuned to catch all + dnl clock_gettime is either part of libc or unavailable. + AC_CHECK_FUNC([clock_gettime], , + [AC_MSG_ERROR([Your system lacks clock_gettime])]) + dnl If the autoconf goo picks up a compiler that runs in pre-POSIX mode, + dnl the fmemopen prototype is hidden causing the unit tests to segfault. + dnl This can happen if gcc is a symlink to gcc46 and is preferred to clang. + AC_CHECK_FUNC([fmemopen], , + [AC_MSG_ERROR([Missing fmemopen, unit tests are likely to segfault. Try CC=clang.])]) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nobody@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nobody"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; *-cygwin*) dnl This is for Cygwin dnl Check for clock_gettime. Some systems put it into -lc, while

1 0

[tlsdate/master] add configure magic for GNU/kFreeBSD
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 5840f8c983fd0f07169d9aacb8f14215ef2154a5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 23:18:38 2013 -0700 add configure magic for GNU/kFreeBSD --- configure.ac | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index ca81844..14aead5 100644 --- a/configure.ac +++ b/configure.ac @@ -184,6 +184,24 @@ case "$host" in [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) ;; + *kfreebsd*-gnu*) + dnl This is for Debian GNU/kFreeBSD + dnl clock_gettime is either part of libc or unavailable. + AC_CHECK_FUNC([clock_gettime], , + [AC_MSG_ERROR([Your system lacks clock_gettime])]) + dnl If the autoconf goo picks up a compiler that runs in pre-POSIX mode, + dnl the fmemopen prototype is hidden causing the unit tests to segfault. + dnl This can happen if gcc is a symlink to gcc46 and is preferred to clang. + AC_CHECK_FUNC([fmemopen], , + [AC_MSG_ERROR([Missing fmemopen, unit tests are likely to segfault. Try CC=clang.])]) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nobody@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nobody"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; *-netbsd*) dnl This is for NetBSD dnl clock_gettime is either part of libc or unavailable.

1 0

[stem/master] Standardizing on digest() providing unicode
by atagar＠torproject.org 25 Apr '13

25 Apr '13

commit a1149f5489065cf7445f83137f3747a4866351e1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 24 21:01:06 2013 -0700 Standardizing on digest() providing unicode Our digest() method provided bytes with python 2 and unicode with python 3. I'm trying to avoid these sort of version-dependent differences since they're a headache when we're support both serieses. The comparison for digest validation was also still failing in python 3 due to types. Caught thanks to aj00200. --- stem/descriptor/server_descriptor.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index dc21813..d2efc0b 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -283,7 +283,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): Provides the hex encoded sha1 of our content. This value is part of the network status entry for this relay. - :returns: **str** with the upper-case hex digest value for this server descriptor + :returns: **unicode** with the upper-case hex digest value for this server descriptor """ raise NotImplementedError("Unsupported Operation: this should be implemented by the ServerDescriptor subclass") @@ -668,7 +668,7 @@ class RelayDescriptor(ServerDescriptor): if start >= 0 and sig_start > 0 and end > start: for_digest = raw_descriptor[start:end] digest_hash = hashlib.sha1(stem.util.str_tools._to_bytes(for_digest)) - self._digest = digest_hash.hexdigest().upper() + self._digest = stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) else: raise ValueError("unable to calculate digest for descriptor") @@ -756,7 +756,9 @@ class RelayDescriptor(ServerDescriptor): except ValueError: raise ValueError("Verification failed, seperator not found") - digest = codecs.encode(decrypted_bytes[seperator_index + 1:], 'hex_codec').upper() + digest_hex = codecs.encode(decrypted_bytes[seperator_index + 1:], 'hex_codec') + digest = stem.util.str_tools._to_unicode(digest_hex.upper()) + local_digest = self.digest() if digest != local_digest: @@ -852,7 +854,7 @@ class BridgeDescriptor(ServerDescriptor): if validate and not stem.util.tor_tools.is_hex_digits(value, 40): raise ValueError("Router digest line had an invalid sha1 digest: %s" % line) - self._digest = value + self._digest = stem.util.str_tools._to_unicode(value) del entries["router-digest"] ServerDescriptor._parse(self, entries, validate)

1 0

[stem/master] Checking pycrypto version when running tests
by atagar＠torproject.org 25 Apr '13

25 Apr '13

commit 2a205415ed9bb1601a1ac65ec7c48f056561b3c8 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 22 07:40:35 2013 -0700 Checking pycrypto version when running tests Adding a check similar to python, pyflakes, and pep8 for the version when we run our tests. Bundling in various other small testing tweaks. --- run_tests.py | 14 +++++++------- stem/util/log.py | 2 +- test/output.py | 2 +- test/util.py | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9667f14..17c9145 100755 --- a/run_tests.py +++ b/run_tests.py @@ -58,7 +58,6 @@ OPT = "auist:l:h" OPT_EXPANDED = ["all", "unit", "integ", "style", "python3", "clean", "targets=", "test=", "log=", "tor=", "help"] CONFIG = stem.util.conf.config_dict("test", { - "target.prereq": {}, "target.torrc": {}, "integ.test_directory": "./test/data", }) @@ -68,7 +67,7 @@ SRC_PATHS = [os.path.join(STEM_BASE, path) for path in ( 'test', 'run_tests.py', os.path.join('docs', 'republish.py'), - os.path.join('docs', 'trac.py'), + os.path.join('docs', 'roles.py'), )] LOG_TYPE_ERROR = """\ @@ -109,6 +108,7 @@ def main(): "INITIALISING", Task("checking stem version", test.util.check_stem_version), Task("checking python version", test.util.check_python_version), + Task("checking pycrypto version", test.util.check_pycrypto_version), Task("checking pyflakes version", test.util.check_pyflakes_version), Task("checking pep8 version", test.util.check_pep8_version), Task("checking for orphaned .pyc files", test.util.clean_orphaned_pyc, (SRC_PATHS,)), @@ -172,9 +172,9 @@ def main(): for target in args.run_targets: # check if we meet this target's tor version prerequisites - target_prereq = CONFIG["target.prereq"].get(target) + target_prereq = test.util.get_prereq(target) - if target_prereq and our_version < stem.version.Requirement[target_prereq]: + if target_prereq and our_version < target_prereq: skipped_targets.append(target) continue @@ -214,13 +214,13 @@ def main(): for lingering_thread in active_threads: println(" %s" % lingering_thread, ERROR) - error_tracker.note_error() + error_tracker.register_error() break except KeyboardInterrupt: println(" aborted starting tor: keyboard interrupt\n", ERROR) break except OSError: - error_tracker.note_error() + error_tracker.register_error() finally: integ_runner.stop() @@ -228,7 +228,7 @@ def main(): println() for target in skipped_targets: - req_version = stem.version.Requirement[CONFIG["target.prereq"][target]] + req_version = test.util.get_prereq(target) println("Unable to run target %s, this requires tor version %s" % (target, req_version), ERROR) println() diff --git a/stem/util/log.py b/stem/util/log.py index 498c489..ca69e7f 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -196,7 +196,7 @@ class LogBuffer(logging.Handler): def __init__(self, runlevel): # TODO: At least in python 2.6 logging.Handler has a bug in that it doesn't - # extend object, causing our super() call to fail. When we drop python 2.5 + # extend object, causing our super() call to fail. When we drop python 2.6 # support we should switch back to using super() instead. #super(LogBuffer, self).__init__(level = logging_level(runlevel)) diff --git a/test/output.py b/test/output.py index be51b60..7cd00b7 100644 --- a/test/output.py +++ b/test/output.py @@ -186,7 +186,7 @@ class ErrorTracker(object): self._category = None self._error_noted = False - def note_error(self): + def register_error(self): """ If called then has_errors_occured() will report that an error has occured, even if we haven't encountered an error message in the tests. diff --git a/test/util.py b/test/util.py index fc68f09..12effd0 100644 --- a/test/util.py +++ b/test/util.py @@ -9,6 +9,7 @@ Helper functions for our test framework. get_unit_tests - provides our unit tests get_integ_tests - provides our integration tests + get_prereq - provides the tor version required to run the given target get_help_message - provides usage information for running our tests get_python3_destination - location where a python3 copy of stem is exported to get_stylistic_issues - checks for PEP8 and other stylistic issues @@ -23,6 +24,7 @@ Tasks are... Initialization |- check_stem_version - checks our version of stem |- check_python_version - checks our version of python + |- check_pycrypto_version - checks our version of pycrypto |- check_pyflakes_version - checks our version of pyflakes |- check_pep8_version - checks our version of pep8 |- clean_orphaned_pyc - removes any *.pyc without a corresponding *.py @@ -41,8 +43,10 @@ import shutil import sys import stem +import stem.prereq import stem.util.conf import stem.util.system +import stem.version import test.output @@ -51,6 +55,7 @@ from test.output import STATUS, ERROR, NO_NL, println CONFIG = stem.util.conf.config_dict("test", { "msg.help": "", "target.description": {}, + "target.prereq": {}, "pep8.ignore": [], "pyflakes.ignore": [], "integ.test_directory": "./test/data", @@ -150,6 +155,25 @@ def get_help_message(): return help_msg +def get_prereq(target): + """ + Provides the tor version required to run the given target. If the target + doesn't have any prerequisite then this provides **None**. + + :param Target target: target to provide the prerequisite for + + :returns: :class:`~stem.version.Version` required to run the given target, or + **None** if there is no prerequisite + """ + + target_prereq = CONFIG["target.prereq"].get(target) + + if target_prereq: + return stem.version.Requirement[target_prereq] + else: + return None + + def get_python3_destination(): """ Provides the location where a python 3 copy of stem is exported to for @@ -298,6 +322,14 @@ def check_python_version(): return '.'.join(map(str, sys.version_info[:3])) +def check_pycrypto_version(): + if stem.prereq.is_crypto_available(): + import Crypto + return Crypto.__version__ + else: + return "missing" + + def check_pyflakes_version(): try: import pyflakes

1 0