tor-commits November 2011

tor-commits@lists.torproject.org

16 participants
987 discussions

[tor/master] Merge remote-tracking branch 'sebastian/pure_removal'
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit cb8059b42dddf25cdfc516a0e7fa869f2b727aee Merge: 25c9e3a 75d8ad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 25 14:54:04 2011 -0500 Merge remote-tracking branch 'sebastian/pure_removal' changes/pure_removal | 7 +++++++ src/common/address.h | 4 ++-- src/common/compat.h | 12 +++++------- src/common/container.h | 28 +++++++++++----------------- src/common/util.h | 46 +++++++++++++++++++++------------------------- src/or/config.h | 2 +- 6 files changed, 47 insertions(+), 52 deletions(-)

1 0

[tor/master] Purge ATTR_PURE from the code
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 75d8ad7320477593655f1ecd0842ed0ef52ed51c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 25 17:56:00 2011 +0100 Purge ATTR_PURE from the code We're using it incorrectly in many cases, and it doesn't help as far as we know. --- changes/pure_removal | 7 +++++++ src/common/address.h | 4 ++-- src/common/compat.h | 12 +++++------- src/common/container.h | 28 +++++++++++----------------- src/common/util.h | 46 +++++++++++++++++++++------------------------- src/or/config.h | 2 +- 6 files changed, 47 insertions(+), 52 deletions(-) diff --git a/changes/pure_removal b/changes/pure_removal new file mode 100644 index 0000000..4a3343c --- /dev/null +++ b/changes/pure_removal @@ -0,0 +1,7 @@ + o Code simplifications and refactorings: + - Remove the pure attribute from all functions that used it previously. + In many cases this we assigned it incorrectly, because the functions + might assert or call impure functions, and we don't have evidence + that keeping the pure attribute is worthwhile. Implements changes + suggested in ticket 4421. + diff --git a/src/common/address.h b/src/common/address.h index 359b026..bc225a6 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -149,7 +149,7 @@ int tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, unsigned int tor_addr_hash(const tor_addr_t *addr); int tor_addr_is_v4(const tor_addr_t *addr); -int tor_addr_is_internal(const tor_addr_t *ip, int for_listening) ATTR_PURE; +int tor_addr_is_internal(const tor_addr_t *ip, int for_listening); /** Longest length that can be required for a reverse lookup name. */ /* 32 nybbles, 32 dots, 8 characters of "ip6.arpa", 1 NUL: 73 characters. */ @@ -185,7 +185,7 @@ int tor_addr_port_split(int severity, const char *addrport, char **address_out, uint16_t *port_out); /* IPv4 helpers */ -int is_internal_IP(uint32_t ip, int for_listening) ATTR_PURE; +int is_internal_IP(uint32_t ip, int for_listening); int addr_port_lookup(int severity, const char *addrport, char **address, uint32_t *addr, uint16_t *port_out); int parse_port_range(const char *port, uint16_t *port_min_out, diff --git a/src/common/compat.h b/src/common/compat.h index b005dd2..e08b0d7 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -135,7 +135,6 @@ extern INLINE double U64_TO_DBL(uint64_t x) { /* GCC has several useful attributes. */ #if defined(__GNUC__) && __GNUC__ >= 3 #define ATTR_NORETURN __attribute__((noreturn)) -#define ATTR_PURE __attribute__((pure)) #define ATTR_CONST __attribute__((const)) #define ATTR_MALLOC __attribute__((malloc)) #define ATTR_NORETURN __attribute__((noreturn)) @@ -168,7 +167,6 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define PREDICT_UNLIKELY(exp) __builtin_expect(!!(exp), 0) #else #define ATTR_NORETURN -#define ATTR_PURE #define ATTR_CONST #define ATTR_MALLOC #define ATTR_NORETURN @@ -271,9 +269,9 @@ int tor_asprintf(char **strp, const char *fmt, ...) int tor_vasprintf(char **strp, const char *fmt, va_list args); const void *tor_memmem(const void *haystack, size_t hlen, const void *needle, - size_t nlen) ATTR_PURE ATTR_NONNULL((1,3)); + size_t nlen) ATTR_NONNULL((1,3)); static const void *tor_memstr(const void *haystack, size_t hlen, - const char *needle) ATTR_PURE ATTR_NONNULL((1,3)); + const char *needle) ATTR_NONNULL((1,3)); static INLINE const void * tor_memstr(const void *haystack, size_t hlen, const char *needle) { @@ -546,9 +544,9 @@ long tor_weak_random(void); /* ===== OS compatibility */ const char *get_uname(void); -uint16_t get_uint16(const void *cp) ATTR_PURE ATTR_NONNULL((1)); -uint32_t get_uint32(const void *cp) ATTR_PURE ATTR_NONNULL((1)); -uint64_t get_uint64(const void *cp) ATTR_PURE ATTR_NONNULL((1)); +uint16_t get_uint16(const void *cp) ATTR_NONNULL((1)); +uint32_t get_uint32(const void *cp) ATTR_NONNULL((1)); +uint64_t get_uint64(const void *cp) ATTR_NONNULL((1)); void set_uint16(void *cp, uint16_t v) ATTR_NONNULL((1)); void set_uint32(void *cp, uint32_t v) ATTR_NONNULL((1)); void set_uint64(void *cp, uint64_t v) ATTR_NONNULL((1)); diff --git a/src/common/container.h b/src/common/container.h index 4a6eba7..fe071cc 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -35,19 +35,14 @@ void smartlist_remove(smartlist_t *sl, const void *element); void *smartlist_pop_last(smartlist_t *sl); void smartlist_reverse(smartlist_t *sl); void smartlist_string_remove(smartlist_t *sl, const char *element); -int smartlist_isin(const smartlist_t *sl, const void *element) ATTR_PURE; -int smartlist_string_isin(const smartlist_t *sl, const char *element) - ATTR_PURE; -int smartlist_string_pos(const smartlist_t *, const char *elt) ATTR_PURE; -int smartlist_string_isin_case(const smartlist_t *sl, const char *element) - ATTR_PURE; -int smartlist_string_num_isin(const smartlist_t *sl, int num) ATTR_PURE; -int smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2) - ATTR_PURE; -int smartlist_digest_isin(const smartlist_t *sl, const char *element) - ATTR_PURE; -int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2) - ATTR_PURE; +int smartlist_isin(const smartlist_t *sl, const void *element); +int smartlist_string_isin(const smartlist_t *sl, const char *element); +int smartlist_string_pos(const smartlist_t *, const char *elt); +int smartlist_string_isin_case(const smartlist_t *sl, const char *element); +int smartlist_string_num_isin(const smartlist_t *sl, int num); +int smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2); +int smartlist_digest_isin(const smartlist_t *sl, const char *element); +int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2); void smartlist_intersect(smartlist_t *sl1, const smartlist_t *sl2); void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2); @@ -55,14 +50,14 @@ void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2); #ifdef DEBUG_SMARTLIST /** Return the number of items in sl. */ -static INLINE int smartlist_len(const smartlist_t *sl) ATTR_PURE; +static INLINE int smartlist_len(const smartlist_t *sl); static INLINE int smartlist_len(const smartlist_t *sl) { tor_assert(sl); return (sl)->num_used; } /** Return the idxth element of sl. */ -static INLINE void *smartlist_get(const smartlist_t *sl, int idx) ATTR_PURE; +static INLINE void *smartlist_get(const smartlist_t *sl, int idx); static INLINE void *smartlist_get(const smartlist_t *sl, int idx) { tor_assert(sl); tor_assert(idx>=0); @@ -114,8 +109,7 @@ void smartlist_uniq_strings(smartlist_t *sl); void smartlist_uniq_digests(smartlist_t *sl); void smartlist_uniq_digests256(smartlist_t *sl); void *smartlist_bsearch(smartlist_t *sl, const void *key, - int (*compare)(const void *key, const void **member)) - ATTR_PURE; + int (*compare)(const void *key, const void **member)); int smartlist_bsearch_idx(const smartlist_t *sl, const void *key, int (*compare)(const void *key, const void **member), int *found_out); diff --git a/src/common/util.h b/src/common/util.h index 77ed1ca..b872574 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -173,19 +173,15 @@ int n_bits_set_u8(uint8_t v); #define HEX_CHARACTERS "0123456789ABCDEFabcdef" void tor_strlower(char *s) ATTR_NONNULL((1)); void tor_strupper(char *s) ATTR_NONNULL((1)); -int tor_strisprint(const char *s) ATTR_PURE ATTR_NONNULL((1)); -int tor_strisnonupper(const char *s) ATTR_PURE ATTR_NONNULL((1)); -int strcmp_opt(const char *s1, const char *s2) ATTR_PURE; -int strcmpstart(const char *s1, const char *s2) ATTR_PURE ATTR_NONNULL((1,2)); -int strcmp_len(const char *s1, const char *s2, size_t len) - ATTR_PURE ATTR_NONNULL((1,2)); -int strcasecmpstart(const char *s1, const char *s2) - ATTR_PURE ATTR_NONNULL((1,2)); -int strcmpend(const char *s1, const char *s2) ATTR_PURE ATTR_NONNULL((1,2)); -int strcasecmpend(const char *s1, const char *s2) - ATTR_PURE ATTR_NONNULL((1,2)); -int fast_memcmpstart(const void *mem, size_t memlen, - const char *prefix) ATTR_PURE; +int tor_strisprint(const char *s) ATTR_NONNULL((1)); +int tor_strisnonupper(const char *s) ATTR_NONNULL((1)); +int strcmp_opt(const char *s1, const char *s2); +int strcmpstart(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int strcmp_len(const char *s1, const char *s2, size_t len) ATTR_NONNULL((1,2)); +int strcasecmpstart(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int strcmpend(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int strcasecmpend(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int fast_memcmpstart(const void *mem, size_t memlen, const char *prefix); void tor_strstrip(char *s, const char *strip) ATTR_NONNULL((1,2)); long tor_parse_long(const char *s, int base, long min, @@ -197,19 +193,19 @@ double tor_parse_double(const char *s, double min, double max, int *ok, uint64_t tor_parse_uint64(const char *s, int base, uint64_t min, uint64_t max, int *ok, char **next); const char *hex_str(const char *from, size_t fromlen) ATTR_NONNULL((1)); -const char *eat_whitespace(const char *s) ATTR_PURE; -const char *eat_whitespace_eos(const char *s, const char *eos) ATTR_PURE; -const char *eat_whitespace_no_nl(const char *s) ATTR_PURE; -const char *eat_whitespace_eos_no_nl(const char *s, const char *eos) ATTR_PURE; -const char *find_whitespace(const char *s) ATTR_PURE; -const char *find_whitespace_eos(const char *s, const char *eos) ATTR_PURE; -const char *find_str_at_start_of_line(const char *haystack, const char *needle) - ATTR_PURE; +const char *eat_whitespace(const char *s); +const char *eat_whitespace_eos(const char *s, const char *eos); +const char *eat_whitespace_no_nl(const char *s); +const char *eat_whitespace_eos_no_nl(const char *s, const char *eos); +const char *find_whitespace(const char *s); +const char *find_whitespace_eos(const char *s, const char *eos); +const char *find_str_at_start_of_line(const char *haystack, + const char *needle); int string_is_C_identifier(const char *string); -int tor_mem_is_zero(const char *mem, size_t len) ATTR_PURE; -int tor_digest_is_zero(const char *digest) ATTR_PURE; -int tor_digest256_is_zero(const char *digest) ATTR_PURE; +int tor_mem_is_zero(const char *mem, size_t len); +int tor_digest_is_zero(const char *digest); +int tor_digest256_is_zero(const char *digest); char *esc_for_log(const char *string) ATTR_MALLOC; const char *escaped(const char *string); struct smartlist_t; @@ -349,7 +345,7 @@ const char *parse_config_line_from_str(const char *line, char **key_out, char **value_out); char *expand_filename(const char *filename); struct smartlist_t *tor_listdir(const char *dirname); -int path_is_relative(const char *filename) ATTR_PURE; +int path_is_relative(const char *filename); /* Process helpers */ void start_daemon(void); diff --git a/src/or/config.h b/src/or/config.h index 76f6841..1e4d567 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -29,7 +29,7 @@ setopt_err_t options_trial_assign(config_line_t *list, int use_defaults, int clear_first, char **msg); int resolve_my_address(int warn_severity, const or_options_t *options, uint32_t *addr, char **hostname_out); -int is_local_addr(const tor_addr_t *addr) ATTR_PURE; +int is_local_addr(const tor_addr_t *addr); void options_init(or_options_t *options); char *options_dump(const or_options_t *options, int minimal); int options_init_from_torrc(int argc, char **argv);

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 84044d619d9192f94244fa4276edcbfb8d59e8ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 19:45:22 2011 +0000 Update translations for vidalia_help --- eu/index.po | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/eu/index.po b/eu/index.po index f51a7ce..19f64aa 100644 --- a/eu/index.po +++ b/eu/index.po @@ -1,12 +1,13 @@ # # Translators: +# <baldarra(a)euskalerria.org>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-25 19:42+0000\n" +"Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "" +msgstr "Laguntza" #. type: Content of: <html><body> #: en/index.html:20 @@ -25,6 +26,9 @@ msgid "" "Select a help topic from the tree on the left or click on the Search button " "above the list of topics to search through all available help topics." msgstr "" +"Aukeratu laguntza gai bat ezkerreko zuhaitzetik edo sakatu Bilatu gai " +"zerrendaren gaineko botoian eskuragarri dauden laguntza gai guztien artean " +"bilatzeko." #. type: Content of: <html><body> #: en/index.html:25 @@ -32,11 +36,13 @@ msgid "" "You can use the Find button on the toolbar above to search within a " "particular help topic." msgstr "" +"Aurkitu botoia erabili dezakezu gaineko tresna barran laguntza gai " +"zehatz bat bilatzeko." #. type: Content of: <html><body> #: en/index.html:30 msgid "The Home button above will bring you back to this home page." -msgstr "" +msgstr "Goiko Etxea botoia orri honetara ekarriko zaitu." #. type: Content of: <html><body> #: en/index.html:34 @@ -44,5 +50,7 @@ msgid "" "See the <a href=\"links.html\">Helpful Links</a> topic for some places you " "can visit to find additional help and information about Vidalia and Tor." msgstr "" +" Ikusi <a href=\"links.html\">Lotura Lagungarriak</a> gaia laguntza gehiago " +"edo Vidalia eta Tor-ri buruzko informazio gahiago aurkitzeko. "

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 3196e53dedf9be48b7de356e88a510c899df45f3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 19:45:01 2011 +0000 Update translations for bridgedb --- eu/bridgedb.po | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/eu/bridgedb.po b/eu/bridgedb.po index 4ce8446..fc6d736 100644 --- a/eu/bridgedb.po +++ b/eu/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2011-11-14 14:42+0000\n" +"PO-Revision-Date: 2011-11-25 19:33+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -29,6 +29,11 @@ msgid "" "even if your ISP is filtering connections to all the known Tor relays,\n" "they probably won't be able to block all the bridges." msgstr "" +"Zubi erreleak (edo \"zubiak\" laburrago) direktorio nagusian\n" +"zerrendatuta ez dauden Tor erreleak dira. Zerrenda publiko oso\n" +"bat ez dagoenez, naiz eta zure Internet Zerbitzu Hornitzaileak\n" +"konexioak Tor errele ezagun guztietara filtratzen egon,\n" +"zihurrenik ez dira zubi guztiak blokeatzeko gai izango." #: lib/bridgedb/I18n.py:28 msgid "" @@ -56,6 +61,11 @@ msgid "" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" msgstr "" +"Zubi publikoen helbideak aurkitzeko beste modu bat\n" +"bridges(a)torproject.org-era mezu bat bidaltzea da, mezuaren\n" +"gorputzean \"get bridges\" esaldiarekin. Hala ere, erasotzaileei\n" +"gauzak zail diezaiegun, hurrengo domeinuetako email\n" +"helbideetatik bidali behar dituzu mezuak:" #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" @@ -68,6 +78,10 @@ msgid "" "will change every few days, so check back periodically if you need more\n" "bridge addresses." msgstr "" +"Zubi publikoen helbideak aurkitzeko beste modu bat\n" +"https://bridges.torproject.org/ bisitatzea da. Orrialde horretatik \n" +"jasoko dituzun erantzunak egun gutxiro aldatuko dira, beraz\n" +"itzuli nohizean behin zubi helbide gehiago behar badituzu." #: lib/bridgedb/I18n.py:48 msgid "(no bridges currently available)"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 7975118b09fb00b4cc00cd36823ba09478319f68 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 17:45:24 2011 +0000 Update translations for vidalia --- ar/vidalia_ar.po | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index 71d51fb..9a07a44 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-11-25 16:35+0000\n" +"PO-Revision-Date: 2011-11-25 17:38+0000\n" "Last-Translator: Moazo <moazbaghdadi(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -191,7 +191,7 @@ msgstr "غيرت مسار torrc، أتريد إعادة تشغيل تور؟" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "ملف إعدادات Tor (torrc) ;; كل الملفات (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" @@ -2085,6 +2085,8 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"كل شيء يتم إرساله عن طريق هذا الاتصال تمكن مراقبته، الرجاء التحقق من إعدادات" +" التطبيق واستخدام بروتوكولات مشفرة فقط، مثل SSL، إن كان هذا ممكناً" msgctxt "MainWindow" msgid "failed (%1)" @@ -3146,7 +3148,7 @@ msgstr "<a href=\"#bridgeUsage\">من استخدم جسري؟</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">ما هذا؟</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" @@ -3270,6 +3272,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"اضغط زر \"ابدأ Tor\" في لوحة تحكم Vialia لإعادة تشغيل برنامج Tor. إن تم " +"إغلاق Tor بشكل غير متوقع، انتقل إلى تبويب \"الخيارات المتقدمة\" في الأعلى " +"لمعرفة تفاصيل عن الخطأ الحاصل." msgctxt "StatusEventWidget" msgid "" @@ -3278,6 +3283,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"أنت الآن تستخدم النسخة \"%1\" من برنامج Tor وهي نسخة لم يعد استخدامها " +"مستحسناً. الرجاء التحديث لآخر نسخة من البرنامج فقد توجد فيها إصلاحات أمنية " +"هامة وإصلاحات لضمان الوثوقية وإصلاحات في الإداء." msgctxt "StatusEventWidget" msgid ""

1 0

(no subject)
by FLAVIO 25 Nov '11

25 Nov '11

aceito a subscrição

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 63bc1da9048cb20bec5726593ed4c057c634a29b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 16:45:23 2011 +0000 Update translations for vidalia --- ar/vidalia_ar.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index acf4da0..71d51fb 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.po @@ -1,6 +1,7 @@ # # Translators: # IBRAHIM <mradonadiego(a)hotmail.fr>, 2011. +# <moazbaghdadi(a)gmail.com>, 2011. # mohammad Alhargan <malham1(a)gmail.com>, 2011. # OsamaK <osamak(a)gnu.org>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-10-01 10:56+0000\n" -"Last-Translator: diegol <mradonadiego(a)hotmail.fr>\n" +"PO-Revision-Date: 2011-11-25 16:35+0000\n" +"Last-Translator: Moazo <moazbaghdadi(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +147,7 @@ msgstr "التحكم بتور" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "استخدام اتصال TCP (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" @@ -154,7 +155,7 @@ msgstr "المسار:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "استعمل مقبس نطاق يونِكس (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc"

1 0

[tor/master] Use EVP for AES only when hardware accel is present
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 8143074b3f110a41cc83335b70eb19dfe2b749b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 20 21:20:31 2011 -0500 Use EVP for AES only when hardware accel is present Fixes bug 4525, fix on 0.2.3.8-alpha. --- changes/aes_hackery | 3 + src/common/aes.c | 120 ++++++++++++++++++++++++++++++++------------------- src/common/aes.h | 2 + src/common/crypto.c | 3 + 4 files changed, 83 insertions(+), 45 deletions(-) diff --git a/changes/aes_hackery b/changes/aes_hackery index 739c8a0..82aae23 100644 --- a/changes/aes_hackery +++ b/changes/aes_hackery @@ -8,4 +8,7 @@ - Use OpenSSL's EVP interface for AES encryption, so that all AES operations can use hardware acceleration (if present). Resolves issue #4442. + - But only use the EVP interface when AES acceleration is enabled, + to avoid a performance regression. Resolves issue #4525. + diff --git a/src/common/aes.c b/src/common/aes.c index 9c03b80..53c80a3 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -14,34 +14,28 @@ #include <assert.h> #include <stdlib.h> #include <string.h> +#include <openssl/aes.h> +#include <openssl/evp.h> +#include <openssl/engine.h> #include "compat.h" #include "aes.h" #include "util.h" #include "torlog.h" -/* We have 2 strategies for getting AES: Via OpenSSL's AES_encrypt function, - * via OpenSSL's EVP_EncryptUpdate function. */ - -/** Defined iff we're using OpenSSL's AES functions for AES. */ -#undef USE_OPENSSL_AES -/** Defined iff we're using OpenSSL's EVP code for AES. */ -#undef USE_OPENSSL_EVP - -/* Here we pick which to use, if none is force-defined above */ -#if (!defined(USE_OPENSSL_AES) && \ - !defined(USE_OPENSSL_EVP)) - -#define USE_OPENSSL_EVP - +#ifdef ANDROID +/* Android's OpenSSL seems to have removed all of its Engine support. */ +#define DISABLE_ENGINES #endif +/* We have 2 strategies for getting AES: Via OpenSSL's AES_encrypt function, + * via OpenSSL's EVP_EncryptUpdate function. + * + * If there's any hardware acceleration in play, we want to be using EVP_* so + * we can get it. Otherwise, we'll want AES_*, which seems to be about 5% + * faster than indirecting through the EVP layer. + */ + /* Include OpenSSL headers as needed. */ -#ifdef USE_OPENSSL_AES -# include <openssl/aes.h> -#endif -#ifdef USE_OPENSSL_EVP -# include <openssl/evp.h> -#endif /*======================================================================*/ /* Interface to AES code, and counter implementation */ @@ -49,11 +43,10 @@ /** Implements an AES counter-mode cipher. */ struct aes_cnt_cipher { /** This next element (however it's defined) is the AES key. */ -#if defined(USE_OPENSSL_EVP) - EVP_CIPHER_CTX key; -#elif defined(USE_OPENSSL_AES) - AES_KEY key; -#endif + union { + EVP_CIPHER_CTX evp; + AES_KEY aes; + } key; #if !defined(WORDS_BIGENDIAN) #define USING_COUNTER_VARS @@ -78,8 +71,45 @@ struct aes_cnt_cipher { uint8_t buf[16]; /** Our current stream position within buf. */ uint8_t pos; + + /** True iff we're using the evp implementation of this cipher. */ + uint8_t using_evp; }; +/** True if we should prefer the EVP implementation for AES, either because + * we're testing it or because we have hardware acceleration configured */ +static int should_use_EVP = 0; + +/** Check whether we should use the EVP interface for AES. If force_val + * is nonnegative, we use use EVP iff it is true. Otherwise, we use EVP + * if there is an engine enabled for aes-ecb. */ +int +evaluate_evp_for_aes(int force_val) +{ + ENGINE *e; + + if (force_val >= 0) { + should_use_EVP = force_val; + return 0; + } +#ifdef DISABLE_ENGINES + should_use_EVP = 0; +#else + e = ENGINE_get_cipher_engine(NID_aes_128_ecb); + + if (e) { + log_notice(LD_CRYPTO, "AES engine \"%s\" found; using EVP_* functions.", + ENGINE_get_name(e)); + should_use_EVP = 1; + } else { + log_notice(LD_CRYPTO, "No AES engine found; using AES_* functions."); + should_use_EVP = 0; + } +#endif + + return 0; +} + #if !defined(USING_COUNTER_VARS) #define COUNTER(c, n) ((c)->ctr_buf.buf32[3-(n)]) #else @@ -100,15 +130,13 @@ _aes_fill_buf(aes_cnt_cipher_t *cipher) * None of these issues are insurmountable in principle. */ -#if defined(USE_OPENSSL_EVP) - { + if (cipher->using_evp) { int outl=16, inl=16; - EVP_EncryptUpdate(&cipher->key, cipher->buf, &outl, + EVP_EncryptUpdate(&cipher->key.evp, cipher->buf, &outl, cipher->ctr_buf.buf, inl); + } else { + AES_encrypt(cipher->ctr_buf.buf, cipher->buf, &cipher->key.aes); } -#elif defined(USE_OPENSSL_AES) - AES_encrypt(cipher->ctr_buf.buf, cipher->buf, &cipher->key); -#endif } /** @@ -129,18 +157,20 @@ aes_new_cipher(void) void aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) { -#if defined(USE_OPENSSL_EVP) - const EVP_CIPHER *c; - switch (key_bits) { - case 128: c = EVP_aes_128_ecb(); break; - case 192: c = EVP_aes_192_ecb(); break; - case 256: c = EVP_aes_256_ecb(); break; - default: tor_assert(0); + if (should_use_EVP) { + const EVP_CIPHER *c; + switch (key_bits) { + case 128: c = EVP_aes_128_ecb(); break; + case 192: c = EVP_aes_192_ecb(); break; + case 256: c = EVP_aes_256_ecb(); break; + default: tor_assert(0); + } + EVP_EncryptInit(&cipher->key.evp, c, (const unsigned char*)key, NULL); + cipher->using_evp = 1; + } else { + AES_set_encrypt_key((const unsigned char *)key, key_bits, &cipher->key.aes); + cipher->using_evp = 0; } - EVP_EncryptInit(&cipher->key, c, (const unsigned char*)key, NULL); -#elif defined(USE_OPENSSL_AES) - AES_set_encrypt_key((const unsigned char *)key, key_bits, &(cipher->key)); -#endif #ifdef USING_COUNTER_VARS cipher->counter0 = 0; cipher->counter1 = 0; @@ -161,9 +191,9 @@ aes_free_cipher(aes_cnt_cipher_t *cipher) { if (!cipher) return; -#ifdef USE_OPENSSL_EVP - EVP_CIPHER_CTX_cleanup(&cipher->key); -#endif + if (cipher->using_evp) { + EVP_CIPHER_CTX_cleanup(&cipher->key.evp); + } memset(cipher, 0, sizeof(aes_cnt_cipher_t)); tor_free(cipher); } diff --git a/src/common/aes.h b/src/common/aes.h index b259194..221e846 100644 --- a/src/common/aes.h +++ b/src/common/aes.h @@ -24,5 +24,7 @@ void aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, void aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len); void aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv); +int evaluate_evp_for_aes(int force_value); + #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index f2ef833..55ad5fd 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -276,6 +276,9 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) } else { log_info(LD_CRYPTO, "NOT using OpenSSL engine support."); } + + evaluate_evp_for_aes(-1); + return crypto_seed_rng(1); } return 0;

1 0

[tor/master] Use openssl's counter mode implementation when we have 1.0.0 or later
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 9814019a54a9a62e27b9e95eec5c9f0e5519fc57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 20 21:43:14 2011 -0500 Use openssl's counter mode implementation when we have 1.0.0 or later This shaves about 7% off our per-cell AES crypto time for me; the effect for accelerated AES crypto should be even more, since the AES calculation itself will make an even smaller portion of the counter-mode performance. (We don't want to do this for pre-1.0.0 OpenSSL, since our AES_CTR implementation was actually faster than OpenSSL's there, by about 10%.) Fixes issue #4526. --- changes/aes_hackery | 8 +++-- src/common/aes.c | 88 ++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/changes/aes_hackery b/changes/aes_hackery index 82aae23..b22cefe 100644 --- a/changes/aes_hackery +++ b/changes/aes_hackery @@ -4,11 +4,13 @@ relatively few servers should still be on any version of OpenSSL that doesn't have good optimized assembly AES. - o Major features: + o Major features (AES performance): - Use OpenSSL's EVP interface for AES encryption, so that all AES operations can use hardware acceleration (if present). Resolves issue #4442. - But only use the EVP interface when AES acceleration is enabled, to avoid a performance regression. Resolves issue #4525. - - + - When using OpenSSL 1.0.0 or later, use OpenSSL's counter mode + implementation; it makes AES_CTR about 7% faster than our old one + (which was about 10% faster than the one OpenSSL used to provide). + Resolves issue #4526. diff --git a/src/common/aes.c b/src/common/aes.c index 53c80a3..cec6899 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -17,6 +17,11 @@ #include <openssl/aes.h> #include <openssl/evp.h> #include <openssl/engine.h> +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +/* See comments about which counter mode implementation to use below. */ +#include <openssl/modes.h> +#define USE_OPENSSL_CTR +#endif #include "compat.h" #include "aes.h" #include "util.h" @@ -35,7 +40,13 @@ * faster than indirecting through the EVP layer. */ -/* Include OpenSSL headers as needed. */ +/* We have 2 strategies for counter mode: use our own, or use OpenSSL's. + * + * Here we have a counter mode that's faster than the one shipping with + * OpenSSL pre-1.0 (by about 10%!). But OpenSSL 1.0.0 added a counter mode + * implementation faster than the one here (by about 7%). So we pick which + * one to used based on the Openssl version above. + */ /*======================================================================*/ /* Interface to AES code, and counter implementation */ @@ -48,7 +59,7 @@ struct aes_cnt_cipher { AES_KEY aes; } key; -#if !defined(WORDS_BIGENDIAN) +#if !defined(WORDS_BIGENDIAN) && !defined(USE_OPENSSL_CTR) #define USING_COUNTER_VARS /** These four values, together, implement a 128-bit counter, with * counter0 as the low-order word and counter3 as the high-order word. */ @@ -70,7 +81,11 @@ struct aes_cnt_cipher { /** The encrypted value of ctr_buf. */ uint8_t buf[16]; /** Our current stream position within buf. */ +#ifdef USE_OPENSSL_CTR + unsigned int pos; +#else uint8_t pos; +#endif /** True iff we're using the evp implementation of this cipher. */ uint8_t using_evp; @@ -110,6 +125,7 @@ evaluate_evp_for_aes(int force_val) return 0; } +#ifndef USE_OPENSSL_CTR #if !defined(USING_COUNTER_VARS) #define COUNTER(c, n) ((c)->ctr_buf.buf32[3-(n)]) #else @@ -138,6 +154,7 @@ _aes_fill_buf(aes_cnt_cipher_t *cipher) AES_encrypt(cipher->ctr_buf.buf, cipher->buf, &cipher->key.aes); } } +#endif /** * Return a newly allocated counter-mode AES128 cipher implementation. @@ -171,6 +188,7 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) AES_set_encrypt_key((const unsigned char *)key, key_bits, &cipher->key.aes); cipher->using_evp = 0; } + #ifdef USING_COUNTER_VARS cipher->counter0 = 0; cipher->counter1 = 0; @@ -181,7 +199,12 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) memset(cipher->ctr_buf.buf, 0, sizeof(cipher->ctr_buf.buf)); cipher->pos = 0; + +#ifdef USE_OPENSSL_CTR + memset(cipher->buf, 0, sizeof(cipher->buf)); +#else _aes_fill_buf(cipher); +#endif } /** Release storage held by cipher @@ -206,6 +229,18 @@ aes_free_cipher(aes_cnt_cipher_t *cipher) #define UPDATE_CTR_BUF(c, n) #endif +#ifdef USE_OPENSSL_CTR +/* Helper function to use EVP with openssl's counter-mode wrapper. */ +static void evp_block128_fn(const uint8_t in[16], + uint8_t out[16], + const void *key) +{ + EVP_CIPHER_CTX *ctx = (void*)key; + int inl=16, outl=16; + EVP_EncryptUpdate(ctx, out, &outl, in, inl); +} +#endif + /** Encrypt len bytes from input, storing the result in * output. Uses the key in cipher, and advances the counter * by len bytes as it encrypts. @@ -214,20 +249,29 @@ void aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, char *output) { - /* This function alone is up to 5% of our runtime in some profiles; anything - * we could do to make it faster would be great. - * - * Experimenting suggests that unrolling the inner loop into a switch - * statement doesn't help. What does seem to help is making the input and - * output buffers word aligned, and never crypting anything besides an - * integer number of words at a time -- it shaves maybe 4-5% of the per-byte - * encryption time measured by bench_aes. We can't do that with the current - * Tor protocol, though: Tor really likes to crypt things in 509-byte - * chunks. - * - * If we were really ambitous, we'd force len to be a multiple of the block - * size, and shave maybe another 4-5% off. - */ +#ifdef USE_OPENSSL_CTR + if (cipher->using_evp) { + /* In openssl 1.0.0, there's an if'd out EVP_aes_128_ctr in evp.h. If + * it weren't disabled, it might be better just to use that. + */ + CRYPTO_ctr128_encrypt((const unsigned char *)input, + (unsigned char *)output, + len, + &cipher->key.evp, + cipher->ctr_buf.buf, + cipher->buf, + &cipher->pos, + evp_block128_fn); + } else { + AES_ctr128_encrypt((const unsigned char *)input, + (unsigned char *)output, + len, + &cipher->key.aes, + cipher->ctr_buf.buf, + cipher->buf, + &cipher->pos); + } +#else int c = cipher->pos; if (PREDICT_UNLIKELY(!len)) return; @@ -250,6 +294,7 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, UPDATE_CTR_BUF(cipher, 0); _aes_fill_buf(cipher); } +#endif } /** Encrypt len bytes from input, storing the results in place. @@ -259,11 +304,9 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, void aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) { - - /* XXXX This function is up to 5% of our runtime in some profiles; - * we should look into unrolling some of the loops; taking advantage - * of alignment, using a bigger buffer, and so on. Not till after 0.1.2.x, - * though. */ +#ifdef USE_OPENSSL_CTR + aes_crypt(cipher, data, len, data); +#else int c = cipher->pos; if (PREDICT_UNLIKELY(!len)) return; @@ -286,6 +329,7 @@ aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) UPDATE_CTR_BUF(cipher, 0); _aes_fill_buf(cipher); } +#endif } /** Reset the 128-bit counter of cipher to the 16-bit big-endian value @@ -302,6 +346,8 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv) cipher->pos = 0; memcpy(cipher->ctr_buf.buf, iv, 16); +#ifndef USE_OPENSSL_CTR _aes_fill_buf(cipher); +#endif }

1 0

[tor/master] Merge branch 'more_aes_hackery_rebased'
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 25c9e3aab9237b9d01229eb9bdb73450cc4ccfcb Merge: fcf5c92 fbec45c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 25 10:36:13 2011 -0500 Merge branch 'more_aes_hackery_rebased' Conflicts: changes/aes_hackery changes/aes_hackery | 10 +++ src/common/aes.c | 208 +++++++++++++++++++++++++++++++++--------------- src/common/aes.h | 2 + src/common/crypto.c | 3 + src/test/test_crypto.c | 33 +++++++- 5 files changed, 186 insertions(+), 70 deletions(-) diff --cc changes/aes_hackery index 0000000,b22cefe..8b2ef1a mode 000000,100644..100644 --- a/changes/aes_hackery +++ b/changes/aes_hackery @@@ -1,0 -1,16 +1,10 @@@ - o Code simplification and refactoring: - - Unconditionally use OpenSSL's AES implementation instead of our - old built-in one. OpenSSL's AES has been better for a while, and - relatively few servers should still be on any version of OpenSSL - that doesn't have good optimized assembly AES. - + o Major features (AES performance): - - Use OpenSSL's EVP interface for AES encryption, so that all - AES operations can use hardware acceleration (if present). - Resolves issue #4442. - - But only use the EVP interface when AES acceleration is enabled, - to avoid a performance regression. Resolves issue #4525. + - When using OpenSSL 1.0.0 or later, use OpenSSL's counter mode + implementation; it makes AES_CTR about 7% faster than our old one + (which was about 10% faster than the one OpenSSL used to provide). + Resolves issue #4526. ++ ++ o Major bugfixes (AES performance): ++ - Only use the EVP interface when AES acceleration is enabled, ++ to avoid a 5-7% performance regression. Resolves issue #4525, ++ bugfix on 0.2.3.8-alpha.

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
99
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2011