tor-commits November 2013

tor-commits@lists.torproject.org

17 participants
1171 discussions

[check/master] Start an API.
by arlo＠torproject.org 19 Nov '13

19 Nov '13

commit 940a0ab0e048913272e4bbfa1b75ac14a456b33e Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Nov 19 00:00:59 2013 -0800 Start an API. One route, /api/bulk --- check.go | 1 + datastore.go | 36 ++++++++++++++++++++++++++++++++---- handlers.go | 18 +++++++++++++----- 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/check.go b/check.go index 73e6a7c..00b25b6 100644 --- a/check.go +++ b/check.go @@ -60,6 +60,7 @@ func main() { // routes http.HandleFunc("/", RootHandler(CompileTemplate(*basePath, domain, "index.html"), exits, domain, Phttp, Locales)) bulk := BulkHandler(CompileTemplate(*basePath, domain, "bulk.html"), exits, domain) + http.HandleFunc("/api/bulk", bulk) http.HandleFunc("/torbulkexitlist", bulk) http.HandleFunc("/cgi-bin/TorBulkExitList.py", bulk) diff --git a/datastore.go b/datastore.go index c01acc6..c23109b 100644 --- a/datastore.go +++ b/datastore.go @@ -84,6 +84,19 @@ func (p PolicyList) Swap(i, j int) { p[i], p[j] = p[j], p[i] } +type ExitInfo struct { + Address string + Fingerprint string +} + +func (e ExitInfo) toJSON() (b []byte) { + j, err := json.MarshalIndent(e, "", " ") + if err != nil { + return + } + return j +} + type Exits struct { List PolicyList UpdateTime time.Time @@ -93,15 +106,30 @@ type Exits struct { func (e *Exits) Dump(w io.Writer, tminus int, ip string, port int) { ap := AddressPort{ip, port} - e.GetAllExits(ap, tminus, func(exit string, _ string) { + e.GetAllExits(ap, tminus, func(exit string, _ string, _ int) { w.Write([]byte(exit + "\n")) }) } -func (e *Exits) GetAllExits(ap AddressPort, tminus int, fn func(string, string)) { +func (e *Exits) DumpJSON(w io.Writer, tminus int, ip string, port int) { + ap := AddressPort{ip, port} + Prefix := []byte(",\n") + w.Write([]byte("[")) + e.GetAllExits(ap, tminus, func(address string, fingerprint string, ind int) { + if ind > 0 { + w.Write(Prefix) + } + w.Write(ExitInfo{address, fingerprint}.toJSON()) + }) + w.Write([]byte("]")) +} + +func (e *Exits) GetAllExits(ap AddressPort, tminus int, fn func(string, string, int)) { + ind := 0 for _, val := range e.List { if val.Tminus <= tminus && val.CanExit(ap) { - fn(val.Address, val.Fingerprint) + fn(val.Address, val.Fingerprint, ind) + ind += 1 } } } @@ -110,7 +138,7 @@ var DefaultTarget = AddressPort{"38.229.70.31", 443} func (e *Exits) PreComputeTorList() { newmap := make(map[string]string) - e.GetAllExits(DefaultTarget, 16, func(ip string, fingerprint string) { + e.GetAllExits(DefaultTarget, 16, func(ip string, fingerprint string, _ int) { newmap[ip] = fingerprint }) e.IsTorLookup = newmap diff --git a/handlers.go b/handlers.go index eee6948..9342ff8 100644 --- a/handlers.go +++ b/handlers.go @@ -9,6 +9,7 @@ import ( "log" "net" "net/http" + "regexp" "strconv" "time" ) @@ -89,6 +90,8 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain func BulkHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain) http.HandlerFunc { + ApiPath := regexp.MustCompile("^/api/") + return func(w http.ResponseWriter, r *http.Request) { q := r.URL.Query() @@ -103,12 +106,17 @@ func BulkHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain w.Header().Set("Last-Modified", Exits.UpdateTime.UTC().Format(http.TimeFormat)) - str := fmt.Sprintf("# This is a list of all Tor exit nodes from the past %d hours that can contact %s on port %d #\n", n, ip, port) - str += fmt.Sprintf("# You can update this list by visiting https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=%s%s%s #\n", ip, port_str, n_str) - str += fmt.Sprintf("# This file was generated on %v #\n", Exits.UpdateTime.UTC().Format(time.UnixDate)) - fmt.Fprintf(w, str) + if q.Get("format") == "json" || ApiPath.MatchString(r.URL.Path) { + w.Header().Set("Content-Type", "application/json") + Exits.DumpJSON(w, n, ip, port) + } else { + str := fmt.Sprintf("# This is a list of all Tor exit nodes from the past %d hours that can contact %s on port %d #\n", n, ip, port) + str += fmt.Sprintf("# You can update this list by visiting https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=%s%s%s #\n", ip, port_str, n_str) + str += fmt.Sprintf("# This file was generated on %v #\n", Exits.UpdateTime.UTC().Format(time.UnixDate)) + fmt.Fprintf(w, str) + Exits.Dump(w, n, ip, port) + } - Exits.Dump(w, n, ip, port) } }

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 19 Nov '13

19 Nov '13

commit 7291876b36c8f20832960328b7bb6def972ac163 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 19 00:15:05 2013 +0000 Update translations for gettor --- ca/gettor.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ca/gettor.po b/ca/gettor.po index 8643a5b..65aeb7f 100644 --- a/ca/gettor.po +++ b/ca/gettor.po @@ -5,13 +5,14 @@ # Translators: # Illenc <provisionalib(a)hotmail.com>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# resteve21 <r.esteve021(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-10-27 08:10+0000\n" -"Last-Translator: Illenc <provisionalib(a)hotmail.com>\n" +"PO-Revision-Date: 2013-11-19 00:00+0000\n" +"Last-Translator: resteve21 <r.esteve021(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "Hola, aquest es el robot \"GetTor\"" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." @@ -46,7 +47,7 @@ msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "" +msgstr "(Demanem disculpes si no ha demanat aquest correu: com que el seu correu electrònic \nprové d'un servei de missatgeria que no utilitza \"DKIM\", li enviarem una breu explicació \ni ignorarem l'adreça d'aquest email per el dia d'avui.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" @@ -199,7 +200,7 @@ msgstr "6.) Procès complet. Gràcies per usar Tor." msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "AJUDA\n=======" #: lib/gettor/i18n.py:138 msgid "" @@ -236,7 +237,7 @@ msgstr "" msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" -msgstr "" +msgstr "ACCÉS BLOQUEJAT/CENSURAT\n===========================" #: lib/gettor/i18n.py:160 msgid "" @@ -433,15 +434,15 @@ msgstr "" msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "PREGUNTES FREQÜENTS\n==========================" #: lib/gettor/i18n.py:272 msgid "What is Tor?" -msgstr "" +msgstr "Què és Tor?" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "El nom \"Tor\" pot fer referència a diversos components." #: lib/gettor/i18n.py:276 msgid "" @@ -458,7 +459,7 @@ msgstr "" #: lib/gettor/i18n.py:286 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Què és el navegador \"Tor Bundle\"?" #: lib/gettor/i18n.py:288 msgid ""

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 18 Nov '13

18 Nov '13

commit 2b35daa7164e46d4bd55ad257dfe40fd85b853ff Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 18 22:46:02 2013 +0000 Update translations for torbirdy --- ru/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd index 89a2979..09983ad 100644 --- a/ru/torbirdy.dtd +++ b/ru/torbirdy.dtd @@ -14,12 +14,12 @@ <!ENTITY torbirdy.prefs.cancel.button "Отмена"> <!ENTITY torbirdy.prefs.extra2.button "Восстановить значения по умолчанию"> <!ENTITY torbirdy.prefs.extra2.key "d"> -<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> +<!ENTITY torbirdy.prefs.testproxy.button "Проверить настройки прокси"> <!ENTITY torbirdy.prefs.testproxy.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Privacy"> +<!ENTITY torbirdy.prefs.proxy.label "Прокси"> +<!ENTITY torbirdy.prefs.privacy.label "Приватность"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Security"> +<!ENTITY torbirdy.prefs.security.label "Безопасность"> <!ENTITY torbirdy.prefs.recommended.text "Использовать рекомендуемые параметры прокси-сервера для TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Выберите сервис анонимизации">

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 18 Nov '13

18 Nov '13

commit a240ff67385327bf0622e067df088cdb6b4ef979 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 18 19:46:11 2013 +0000 Update translations for mat-gui_completed --- ru.po | 245 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 123 insertions(+), 122 deletions(-) diff --git a/ru.po b/ru.po index a76417d..ae2c36a 100644 --- a/ru.po +++ b/ru.po @@ -3,14 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Translators: +# Bergitte <alvina_alexandrova(a)mail.ru>, 2013 # Arioko <arikushi777(a)gmail.com>, 2013 +# Dmitry <linuxsquirrel.dev(a)gmail.com>, 2013 +# mendov <mr.mendov(a)gmail.com>, 2013 +# oulgocke <beandonlybe(a)yandex.ru>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-06-24 22:52+0000\n" -"Last-Translator: Arioko <arikushi777(a)gmail.com>\n" +"POT-Creation-Date: 2013-07-01 19:26+0200\n" +"PO-Revision-Date: 2013-11-18 19:30+0000\n" +"Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,161 +23,157 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: mat-gui:95 mat-gui:563 mat-gui:579 +#: mat-gui:65 mat-gui:375 mat-gui:387 msgid "Ready" msgstr "Готов" -#: mat-gui:107 -msgid "Add" -msgstr "Добавить" - -#: mat-gui:109 mat-gui:183 -msgid "Add files" -msgstr "Добавить файлы" +#: mat-gui:134 +msgid "Choose files" +msgstr "Выбрать файлы" -#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 -#: mat-gui:573 mat-gui:575 -msgid "Clean" -msgstr "Очистить" +#: mat-gui:141 +msgid "All files" +msgstr "Все файлы" -#: mat-gui:115 -msgid "Clean selected files" -msgstr "Очистить выбранные файлы" +#: mat-gui:148 +msgid "Supported files" +msgstr "Поддерживаемые файлы" -#: mat-gui:119 mat-gui:214 -msgid "Check" -msgstr "Проверить" +#: mat-gui:164 +msgid "No metadata found" +msgstr "Метаданные не найдены" -#: mat-gui:121 -msgid "Check selected files for harmful meta" -msgstr "Проверить выбранные файлы на наличие вредных мета" +#: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 +msgid "Clean" +msgstr "Очистить" -#: mat-gui:125 mat-gui:185 -msgid "Quit" -msgstr "Выйти" +#: mat-gui:167 mat-gui:372 +msgid "Dirty" +msgstr "Грязный" -#: mat-gui:137 -msgid "Path" -msgstr "Путь" +#: mat-gui:172 +#, python-format +msgid "%s's metadata" +msgstr "%s's метаданные" -#: mat-gui:137 mat-gui:363 -msgid "Filename" -msgstr "Имя файла" +#: mat-gui:183 +msgid "Trash your meta, keep your data" +msgstr "Очистить метаданные" -#: mat-gui:137 mat-gui:365 -msgid "Mimetype" -msgstr "Mime тип" +#: mat-gui:188 +msgid "Website" +msgstr "Вебсайт" -#: mat-gui:137 -msgid "State" -msgstr "Состояние" +#: mat-gui:214 data/mat.ui:107 +msgid "Preferences" +msgstr "Настройки" -#: mat-gui:138 -msgid "Cleaned file" -msgstr "Очищенный файл" +#: mat-gui:228 +msgid "Reduce PDF quality" +msgstr "Уменьшить PDF качество" -#: mat-gui:182 -msgid "Files" -msgstr "Файлы" +#: mat-gui:231 +msgid "Reduce the produced PDF size and quality" +msgstr "Сокращение размера и качества сделанного PDF" -#: mat-gui:188 -msgid "Edit" -msgstr "Редактировать" +#: mat-gui:234 +msgid "Add unsupported file to archives" +msgstr "Добавить не поддерживаемый файл в архив" -#: mat-gui:189 -msgid "Clear the filelist" -msgstr "Очистить список файлов" +#: mat-gui:238 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "Добавить не поддерживаемый (и поэтому не-анонимный) файл в выходной архив" -#: mat-gui:192 mat-gui:447 -msgid "Preferences" -msgstr "Настройки" +#: mat-gui:283 +msgid "Unknown" +msgstr "Неизвестно" -#: mat-gui:195 -msgid "Process" -msgstr "Процесс" +#: mat-gui:330 +msgid "Not-supported" +msgstr "Не поддерживаемый" -#: mat-gui:218 -msgid "Help" -msgstr "Помощ" +#: mat-gui:347 +msgid "Unknown mimetype" +msgstr "Неизвестный mimetype" -#: mat-gui:219 mat-gui:395 -msgid "Supported formats" -msgstr "Поддерживаемые форматы" +#: mat-gui:354 data/mat.ui:291 +msgid "Filename" +msgstr "Имя файла" -#: mat-gui:220 -msgid "About" -msgstr "О.." +#: mat-gui:356 +msgid "Mimetype" +msgstr "Mime тип" -#: mat-gui:241 -msgid "Choose files" -msgstr "Выбрать файлы" +#: mat-gui:366 +#, python-format +msgid "Checking %s" +msgstr "Проверка %s" -#: mat-gui:248 -msgid "All files" -msgstr "Все файлы" +#: mat-gui:381 +#, python-format +msgid "Cleaning %s" +msgstr "Очистка %s" -#: mat-gui:255 -msgid "Supported files" -msgstr "Поддерживаемые файлы" +#: data/mat.ui:63 +msgid "_File" +msgstr "_Файл" -#: mat-gui:297 -msgid "unknow" -msgstr "неизвестно" +#: data/mat.ui:99 +msgid "_Edit" +msgstr "_Правка" -#: mat-gui:313 mat-gui:559 -msgid "Dirty" -msgstr "Грязный" +#: data/mat.ui:118 data/mat.ui:253 +msgid "Clear" +msgstr "Очистить" -#: mat-gui:343 -msgid "Not-supported" -msgstr "Не поддерживаемый" +#: data/mat.ui:134 +msgid "_Process" +msgstr "_Процесс" -#: mat-gui:381 -msgid "This software was coded during the GSoC 2011" -msgstr "Эта программа была закодирована в Google Summer of Code 2011" +#: data/mat.ui:168 +msgid "_Help" +msgstr "_Справка" -#: mat-gui:386 -msgid "Website" -msgstr "Вебсайт" +#: data/mat.ui:214 +msgid "Add" +msgstr "Добавить" -#: mat-gui:461 -msgid "Force Clean" -msgstr "Форсированная очистка" +#: data/mat.ui:240 +msgid "Check" +msgstr "Проверить" -#: mat-gui:464 -msgid "Do not check if already clean before cleaning" -msgstr "Не проверять, если уже чистый перед очисткой" +#: data/mat.ui:308 +msgid "State" +msgstr "Состояние" -#: mat-gui:468 -msgid "Backup" -msgstr "Резервное копирование" +#: data/mat.ui:346 data/mat.ui:495 +msgid "Metadata" +msgstr "Метаданные" -#: mat-gui:471 -msgid "Keep a backup copy" -msgstr "Хранить резервную копию" +#: data/mat.ui:400 +msgid "Name" +msgstr "Имя" -#: mat-gui:474 -msgid "Reduce PDF quality" -msgstr "Уменьшить PDF качество" +#: data/mat.ui:414 +msgid "Content" +msgstr "Содержание" -#: mat-gui:477 -msgid "Reduce the produced PDF size and quality" -msgstr "Сокращение размера и качества сделанного PDF" +#: data/mat.ui:448 +msgid "Supported formats" +msgstr "Поддерживаемые форматы" -#: mat-gui:480 -msgid "Add unsupported file to archives" -msgstr "Добавить не поддерживаемый файл в архив" +#: data/mat.ui:482 +msgid "Support" +msgstr "Поддержка" -#: mat-gui:484 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Добавить не поддерживаемый (и поэтому не-анонимный) файл в выходной архив" +#: data/mat.ui:508 +msgid "Method" +msgstr "Метод" -#: mat-gui:554 -#, python-format -msgid "Checking %s..." -msgstr "Проверка %s..." +#: data/mat.ui:521 +msgid "Remaining" +msgstr "Осталось" -#: mat-gui:572 -#, python-format -msgid "Cleaning %s..." -msgstr "Очистка %s..." +#: data/mat.ui:556 +msgid "Fileformat" +msgstr "Формат файла"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 18 Nov '13

18 Nov '13

commit 0def362c3534f351f7776f3b8bccb37ea5d055cf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 18 19:46:09 2013 +0000 Update translations for mat-gui --- ru.po | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ru.po b/ru.po index 5be7fa7..ae2c36a 100644 --- a/ru.po +++ b/ru.po @@ -3,17 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Translators: # Bergitte <alvina_alexandrova(a)mail.ru>, 2013 # Arioko <arikushi777(a)gmail.com>, 2013 # Dmitry <linuxsquirrel.dev(a)gmail.com>, 2013 # mendov <mr.mendov(a)gmail.com>, 2013 +# oulgocke <beandonlybe(a)yandex.ru>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-10-03 12:10+0000\n" -"Last-Translator: mendov <mr.mendov(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-18 19:30+0000\n" +"Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +58,7 @@ msgstr "%s's метаданные" #: mat-gui:183 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Очистить метаданные" #: mat-gui:188 msgid "Website" @@ -114,11 +116,11 @@ msgstr "Очистка %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "_Файл" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "_Правка" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear" @@ -126,11 +128,11 @@ msgstr "Очистить" #: data/mat.ui:134 msgid "_Process" -msgstr "" +msgstr "_Процесс" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "_Справка" #: data/mat.ui:214 msgid "Add" @@ -146,7 +148,7 @@ msgstr "Состояние" #: data/mat.ui:346 data/mat.ui:495 msgid "Metadata" -msgstr "" +msgstr "Метаданные" #: data/mat.ui:400 msgid "Name" @@ -170,7 +172,7 @@ msgstr "Метод" #: data/mat.ui:521 msgid "Remaining" -msgstr "" +msgstr "Осталось" #: data/mat.ui:556 msgid "Fileformat"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 18 Nov '13

18 Nov '13

commit 3aeb5c667863f9c48371a3ee21adc064a5e64541 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 18 19:45:59 2013 +0000 Update translations for liveusb-creator_completed --- ru/ru.po | 147 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 76 insertions(+), 71 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 3823a6e..3d3743f 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-08 21:50+0000\n" +"POT-Creation-Date: 2013-11-12 13:29+0100\n" +"PO-Revision-Date: 2013-11-18 19:40+0000\n" "Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -31,17 +31,22 @@ msgstr "" msgid "%(distribution)s installer" msgstr "Установщик %(distribution)s" -#: ../liveusb/gui.py:803 +#: ../liveusb/gui.py:807 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s выбрано" -#: ../liveusb/gui.py:440 +#: ../liveusb/gui.py:437 +#, python-format +msgid "%(size)s %(label)s" +msgstr "%(size)s %(label)s" + +#: ../liveusb/gui.py:443 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1020 +#: ../liveusb/creator.py:1023 #, python-format msgid "%s already bootable" msgstr "%s уже загрузочный" @@ -98,12 +103,12 @@ msgid "" "persist after a reboot." msgstr "Путём выделения дополнительного места на флешке для постоянного хранилища, Вы получите возможность сохранять данные и делать постоянные модификации Вашей живой ОС. Без этого у Вас не получится сохранить данные так, чтобы они остались после перезагрузки." -#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 +#: ../liveusb/creator.py:1125 ../liveusb/creator.py:1388 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Вычисление SHA1 от %s" -#: ../liveusb/creator.py:1333 +#: ../liveusb/creator.py:1336 msgid "Cannot find" msgstr "Невозможно найти" @@ -126,16 +131,12 @@ msgid "" "Upgrade" msgstr "Клонировать\n&&\nОбновить" -#: ../liveusb/dialog.py:174 -msgid "Create Live USB" -msgstr "Создать LiveUSB" - #: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Создание %sМБ постоянного хранилища" -#: ../liveusb/gui.py:562 +#: ../liveusb/gui.py:565 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Устройство пока не примонтировано, поэтому нельзя определить количество свободного места." @@ -145,11 +146,11 @@ msgstr "Устройство пока не примонтировано, поэ msgid "Download %(distribution)s" msgstr "Загрузка %(distribution)s" -#: ../liveusb/gui.py:777 +#: ../liveusb/gui.py:781 msgid "Download complete!" msgstr "Загрузка завершена!" -#: ../liveusb/gui.py:781 +#: ../liveusb/gui.py:785 msgid "Download failed: " msgstr "Ошибка загрузки: " @@ -158,16 +159,16 @@ msgstr "Ошибка загрузки: " msgid "Downloading %s..." msgstr "Загрузка %s..." -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1121 msgid "Drive is a loopback, skipping MBR reset" msgstr "Этот диск является петлевым устройством, пропускаем сброс MBR" -#: ../liveusb/creator.py:813 +#: ../liveusb/creator.py:816 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Открытие непримонтированного устройства для '%(device)s'" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1201 msgid "Error probing device" msgstr "Ошибка зондирования устройства" @@ -187,7 +188,7 @@ msgstr "Ошибка: Неверное SHA1 вашего Live CD образа. msgid "Extracting live image to the target device..." msgstr "Извлечение живого образа на целевое устройство..." -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1066 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Форматирование %(device)s в FAT32" @@ -206,7 +207,11 @@ msgid "" "downloaded for you." msgstr "Если вы не выберете существующий Live ISO, выбранные релиз будет загружен для вас." -#: ../liveusb/gui.py:625 +#: ../liveusb/dialog.py:174 +msgid "Install Tails" +msgstr "Установить Tails" + +#: ../liveusb/gui.py:628 msgid "Installation complete!" msgstr "Установка завершена!" @@ -215,11 +220,11 @@ msgstr "Установка завершена!" msgid "Installation complete! (%s)" msgstr "Установка завершена! (%s)" -#: ../liveusb/gui.py:626 +#: ../liveusb/gui.py:629 msgid "Installation was completed. Press OK to close this program." msgstr "Установка была завершена. Нажмите OK чтобы закрыть программу." -#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 +#: ../liveusb/creator.py:919 ../liveusb/creator.py:1242 msgid "Installing bootloader..." msgstr "Установка загрузчика..." @@ -227,28 +232,28 @@ msgstr "Установка загрузчика..." msgid "LiveUSB creation failed!" msgstr "Ошибка создания LiveUSB!" -#: ../liveusb/creator.py:1334 +#: ../liveusb/creator.py:1337 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Обязательно распакуйте zip-файл liveusb-creator целиком перед запуском этой программы" -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:1213 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Убедитесь, что USB-устройство подключено и отформатировано (FAT)" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:838 #, python-format msgid "Mount %s exists after unmounting" msgstr "Точка монтирования %s существует во время монтирования" -#: ../liveusb/gui.py:568 +#: ../liveusb/gui.py:571 #, python-format msgid "No free space on device %(device)s" msgstr "Отсутствует свободное пространство на устройстве %(device)s" -#: ../liveusb/creator.py:802 +#: ../liveusb/creator.py:805 msgid "No mount points found" msgstr "Нет точек монтирования" @@ -259,20 +264,20 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "Недостаточно места на устройстве.\n%dMB ISO + %dMB постоянное хранилище > %dMB свободного места" -#: ../liveusb/gui.py:549 +#: ../liveusb/gui.py:552 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Раздел FAT16: Размер оверлея возможен не более 2ГБ" -#: ../liveusb/gui.py:545 +#: ../liveusb/gui.py:548 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Раздел отформатирован в FAT32; Размер постоянного хранилища ограничен 4G" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 +#: ../liveusb/creator.py:226 ../liveusb/creator.py:845 #, python-format msgid "Partitioning device %(device)s" msgstr "Разметка устройства %(device)s" -#: ../liveusb/gui.py:616 +#: ../liveusb/gui.py:619 msgid "Persistent Storage" msgstr "Постоянное хранилище" @@ -280,19 +285,19 @@ msgstr "Постоянное хранилище" msgid "Persistent Storage (0 MB)" msgstr "Постоянное хранилище (0 MB)" -#: ../liveusb/gui.py:697 ../liveusb/gui.py:726 +#: ../liveusb/gui.py:700 ../liveusb/gui.py:730 msgid "Please confirm your device selection" msgstr "Пожалуйста, подтвердите выбор устройства" -#: ../liveusb/gui.py:462 +#: ../liveusb/gui.py:465 msgid "Refreshing releases..." msgstr "Обновление списка релизов..." -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:470 msgid "Releases updated!" msgstr "Список релизов обновлён!" -#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1260 #, python-format msgid "Removing %(file)s" msgstr "Removing %(file)s" @@ -301,12 +306,12 @@ msgstr "Removing %(file)s" msgid "Removing existing Live OS" msgstr "Удаление существующей Live OS" -#: ../liveusb/creator.py:1112 +#: ../liveusb/creator.py:1115 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Сброс главной загрузочной записи %s" -#: ../liveusb/gui.py:788 +#: ../liveusb/gui.py:792 msgid "Select Live ISO" msgstr "Выберите Live ISO" @@ -314,7 +319,7 @@ msgstr "Выберите Live ISO" msgid "Setting up OLPC boot file..." msgstr "Настройка загрузочного файла OLPC..." -#: ../liveusb/creator.py:716 +#: ../liveusb/creator.py:719 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " @@ -326,7 +331,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Тип источника не поддерживает проверку контрольных сумм MD5 для ISO, пропускаем" -#: ../liveusb/creator.py:1146 +#: ../liveusb/creator.py:1149 msgid "Synchronizing data on disk..." msgstr "Сихронизирую данные на диске..." @@ -334,13 +339,13 @@ msgstr "Сихронизирую данные на диске..." msgid "Target Device" msgstr "Целевое устройство" -#: ../liveusb/gui.py:662 +#: ../liveusb/gui.py:665 msgid "" -"The Master Boot Record on your device is blank. Pressing 'Create Live USB' " +"The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "Загрузочная область устройства пуста. Нажатие 'Создать Live USB' снова сбросит эту область." +msgstr "Главная загрузочная запись на Вашем устройстве пустая. Повторное нажатие кнопки 'Установить Tails' приведёт к сбросу MBR на этом устройстве." -#: ../liveusb/gui.py:791 +#: ../liveusb/gui.py:795 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -384,11 +389,11 @@ msgstr "Это прогресс-бар, который показывает ка msgid "This is the status console, where all messages get written to." msgstr "Это консоль состояния, куда пишутся все сообщения." -#: ../liveusb/creator.py:879 +#: ../liveusb/creator.py:882 msgid "Trying to continue anyway." msgstr "Попытка продолжить всё равно." -#: ../liveusb/creator.py:911 +#: ../liveusb/creator.py:914 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Невозможно изменить метку тома: %(message)s" @@ -407,24 +412,24 @@ msgstr "Невозможно копировать %(infile)s в %(outfile)s: %(m msgid "Unable to find any USB drive" msgstr "Невозможно найти ни одного USB накопителя" -#: ../liveusb/creator.py:1200 +#: ../liveusb/creator.py:1203 msgid "Unable to find any supported device" msgstr "Невозможно найти поддерживаемое устройство" -#: ../liveusb/creator.py:1040 +#: ../liveusb/creator.py:1043 msgid "Unable to find partition" msgstr "Невозможно найти раздел" -#: ../liveusb/creator.py:1280 +#: ../liveusb/creator.py:1283 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Невозможно получить Win32_LogicalDisk; win32com ничего не вернул" -#: ../liveusb/gui.py:690 +#: ../liveusb/gui.py:693 msgid "Unable to mount device" msgstr "Невозможно смонтировать устройство" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:793 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Невозможно смонтировать устройство %(message)s" @@ -439,18 +444,18 @@ msgstr "Невозможно удалить директорию из преды msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Невозможно удалить файл из предыдущей LiveOS: %(message)s" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1118 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Невозможно сбросить MBR. Возможно, у Вас не установлен пакет `syslinux`." -#: ../liveusb/gui.py:797 +#: ../liveusb/gui.py:801 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Невозможно использовать указанный файл. Попробуйте переместить ISO в корень диска (например C:\\)" -#: ../liveusb/creator.py:697 +#: ../liveusb/creator.py:700 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Невозможно записать на %(device)s, пропускаю." @@ -459,12 +464,12 @@ msgstr "Невозможно записать на %(device)s, пропуска msgid "Unknown ISO, skipping checksum verification" msgstr "Неизвестный ISO, проверка контрольной суммы пропущена" -#: ../liveusb/creator.py:786 +#: ../liveusb/creator.py:789 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Неизвестное исключение dbus во время монтирования устройства: %(message)s" -#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:768 ../liveusb/creator.py:893 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Неизвестная файловая система. Ваше устройство нуждается в переформатировании." @@ -473,34 +478,34 @@ msgstr "Неизвестная файловая система. Ваше уст msgid "Unknown release: %s" msgstr "Неизвестный выпуск: %s" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:830 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Размонтирование '%(udi)s' на '%(device)s'" -#: ../liveusb/creator.py:823 +#: ../liveusb/creator.py:826 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Размонтирование файловых систем на '%(device)s'" -#: ../liveusb/creator.py:876 +#: ../liveusb/creator.py:879 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Неподдерживаемое устройство '%(device)s', пожалуйста, сообщите об ошибке." -#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 +#: ../liveusb/creator.py:773 ../liveusb/creator.py:896 #, python-format msgid "Unsupported filesystem: %s" msgstr "Неподдерживаемая файловая система: %s" -#: ../liveusb/creator.py:768 +#: ../liveusb/creator.py:771 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Не поддерживаемая файловая система: %s⏎\nВ случае, если вы самостоятельно собираетесь обновить систему (если система была установлена без инсталлера), данная опция не поддерживается: вам надо установить новую систему, просто выбрав \"Копировать и Установить\"." -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1216 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -527,16 +532,16 @@ msgstr "Проверка SHA1 LiveCD образа..." msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Проверка SHA256 LiveCD образа..." -#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 +#: ../liveusb/creator.py:890 ../liveusb/creator.py:1209 msgid "Verifying filesystem..." msgstr "Проверка файловой системы..." -#: ../liveusb/gui.py:724 +#: ../liveusb/gui.py:728 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Внимание: Создание нового постоянного слоя удалит существующий слой." -#: ../liveusb/gui.py:676 +#: ../liveusb/gui.py:679 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " @@ -555,20 +560,20 @@ msgstr "Внимание: Для работы требуются права Ад msgid "Wrote to device at %(speed)d MB/sec" msgstr "Записано на скорости %(speed)d МБ/сек" -#: ../liveusb/gui.py:698 +#: ../liveusb/gui.py:701 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " -"(%(device)s). All data on the selected drive will be lost. Continue?" +"(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Вы собираетесь установить Tails на устройство %(size)s %(vendor)s %(model)s (%(device)s). Все данные будут потеряны. Продолжить?" -#: ../liveusb/gui.py:715 +#: ../liveusb/gui.py:718 #, python-format msgid "" -"You are going to upgrade Tails on the %(vendor)s %(model)s device " -"(%(device)s). Any persistent volume on this device will remain unchanged. " -"Continue?" -msgstr "Вы собираетесь обновить Tails на устройстве %(vendor)s %(model)s (%(device)s). Постоянное хранилище на этом томе останется без изменений. Продолжить?" +"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " +"device (%(device)s). Any persistent volume on this device will remain " +"unchanged. Continue?" +msgstr "Вы собираетесь обновить Tails на устройстве %(parent_size)s %(vendor)s %(model)s (%(device)s). Постоянное хранилище на этом томе останется без изменений. Продолжить?" #: ../liveusb/creator.py:607 msgid "" @@ -576,7 +581,7 @@ msgid "" "ext4 filesystem" msgstr "Вы используете старую версию syslinux-extlinux, которая не поддерживает ext4 файловую систему" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:786 msgid "You can try again to resume your download" msgstr "Вы можете попробовать продолжить загрузку"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 18 Nov '13

18 Nov '13

commit 685a15212efdc0792754f5f55eb7a7a1c152646d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 18 19:45:56 2013 +0000 Update translations for liveusb-creator --- ru/ru.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index c3a6aec..3d3743f 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-12 13:29+0100\n" -"PO-Revision-Date: 2013-11-13 09:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-18 19:40+0000\n" +"Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +39,7 @@ msgstr "%(filename)s выбрано" #: ../liveusb/gui.py:437 #, python-format msgid "%(size)s %(label)s" -msgstr "" +msgstr "%(size)s %(label)s" #: ../liveusb/gui.py:443 #, python-format @@ -209,7 +209,7 @@ msgstr "Если вы не выберете существующий Live ISO, #: ../liveusb/dialog.py:174 msgid "Install Tails" -msgstr "" +msgstr "Установить Tails" #: ../liveusb/gui.py:628 msgid "Installation complete!" @@ -343,7 +343,7 @@ msgstr "Целевое устройство" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "" +msgstr "Главная загрузочная запись на Вашем устройстве пустая. Повторное нажатие кнопки 'Установить Tails' приведёт к сбросу MBR на этом устройстве." #: ../liveusb/gui.py:795 msgid "" @@ -565,7 +565,7 @@ msgstr "Записано на скорости %(speed)d МБ/сек" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Вы собираетесь установить Tails на устройство %(size)s %(vendor)s %(model)s (%(device)s). Все данные будут потеряны. Продолжить?" #: ../liveusb/gui.py:718 #, python-format @@ -573,7 +573,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "Вы собираетесь обновить Tails на устройстве %(parent_size)s %(vendor)s %(model)s (%(device)s). Постоянное хранилище на этом томе останется без изменений. Продолжить?" #: ../liveusb/creator.py:607 msgid ""

1 0

[tor/master] Make the dir-key-crosscert element required
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit f6e07c158f3d161e570e34ab6f4ca75f351df3a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 14 09:37:41 2013 -0500 Make the dir-key-crosscert element required In proposal 157, we added a cross-certification element for directory authority certificates. We implemented it in 0.2.1.9-alpha. All Tor directory authorities now generate it. Here, as planned, make it required, so that we can finally close proposal 157. The biggest change in the code is in the unit test data, where some old hardcoded certs that we made long ago have become no longer valid and now need to be replaced. --- changes/prop157-require | 5 ++ src/or/or.h | 3 - src/or/routerparse.c | 25 +++---- src/test/test_data.c | 181 ++++++++++++++++++++++++++--------------------- src/test/test_dir.c | 1 - 5 files changed, 117 insertions(+), 98 deletions(-) diff --git a/changes/prop157-require b/changes/prop157-require new file mode 100644 index 0000000..0c35f64 --- /dev/null +++ b/changes/prop157-require @@ -0,0 +1,5 @@ + o Minor features: + - Clients now reject any directory authority certificates lacking + a dir-key-crosscert element. These have been included since + 0.2.1.9-alpha, so there's no real reason for them to be optional + any longer. Completes proposal 157. \ No newline at end of file diff --git a/src/or/or.h b/src/or/or.h index eff5a6d..d819a5c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2586,9 +2586,6 @@ typedef struct authority_cert_t { uint32_t addr; /** This authority's directory port. */ uint16_t dir_port; - /** True iff this certificate was cross-certified by signing the identity - * key with the signing key. */ - uint8_t is_cross_certified; } authority_cert_t; /** Bitfield enum type listing types of information that directory authorities diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 890d596..8691752 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -386,7 +386,7 @@ static token_rule_t dir_footer_token_table[] = { T1("dir-key-published",K_DIR_KEY_PUBLISHED, CONCAT_ARGS, NO_OBJ), \ T1("dir-key-expires", K_DIR_KEY_EXPIRES, CONCAT_ARGS, NO_OBJ), \ T1("dir-signing-key", K_DIR_SIGNING_KEY, NO_ARGS, NEED_KEY ),\ - T01("dir-key-crosscert", K_DIR_KEY_CROSSCERT, NO_ARGS, NEED_OBJ ),\ + T1("dir-key-crosscert", K_DIR_KEY_CROSSCERT, NO_ARGS, NEED_OBJ ),\ T1("dir-key-certification", K_DIR_KEY_CERTIFICATION, \ NO_ARGS, NEED_OBJ), \ T01("dir-address", K_DIR_ADDRESS, GE(1), NO_OBJ), @@ -1728,7 +1728,6 @@ authority_cert_parse_from_string(const char *s, const char **end_of_string) log_debug(LD_DIR, "We already checked the signature on this " "certificate; no need to do so again."); found = 1; - cert->is_cross_certified = old_cert->is_cross_certified; } } if (!found) { @@ -1737,18 +1736,16 @@ authority_cert_parse_from_string(const char *s, const char **end_of_string) goto err; } - if ((tok = find_opt_by_keyword(tokens, K_DIR_KEY_CROSSCERT))) { - /* XXXX Once all authorities generate cross-certified certificates, - * make this field mandatory. */ - if (check_signature_token(cert->cache_info.identity_digest, - DIGEST_LEN, - tok, - cert->signing_key, - CST_NO_CHECK_OBJTYPE, - "key cross-certification")) { - goto err; - } - cert->is_cross_certified = 1; + tok = find_by_keyword(tokens, K_DIR_KEY_CROSSCERT); + /* XXXX Once all authorities generate cross-certified certificates, + * make this field mandatory. */ + if (check_signature_token(cert->cache_info.identity_digest, + DIGEST_LEN, + tok, + cert->signing_key, + CST_NO_CHECK_OBJTYPE, + "key cross-certification")) { + goto err; } } diff --git a/src/test/test_data.c b/src/test/test_data.c index 5f0f7cb..71f001d 100644 --- a/src/test/test_data.c +++ b/src/test/test_data.c @@ -3,8 +3,18 @@ * Copyright (c) 2007-2013, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/* Our unit test expect that the AUTHORITY_CERT_* public keys will sort + * in this order. */ +#define AUTHORITY_CERT_A AUTHORITY_CERT_3 +#define AUTHORITY_CERT_B AUTHORITY_CERT_1 +#define AUTHORITY_CERT_C AUTHORITY_CERT_2 + +#define AUTHORITY_SIGNKEY_A AUTHORITY_SIGNKEY_3 +#define AUTHORITY_SIGNKEY_B AUTHORITY_SIGNKEY_1 +#define AUTHORITY_SIGNKEY_C AUTHORITY_SIGNKEY_2 + /** First of 3 example authority certificates for unit testing. */ -const char AUTHORITY_CERT_1[] = +const char AUTHORITY_CERT_A[] = "dir-key-certificate-version 3\n" "fingerprint D867ACF56A9D229B35C25F0090BC9867E906BE69\n" "dir-key-published 2008-12-12 18:07:24\n" @@ -46,7 +56,7 @@ const char AUTHORITY_CERT_1[] = "-----END SIGNATURE-----\n"; /** The private signing key for AUTHORITY_CERT_1 */ -const char AUTHORITY_SIGNKEY_1[] = +const char AUTHORITY_SIGNKEY_A[] = "-----BEGIN RSA PRIVATE KEY-----\n" "MIICWwIBAAKBgQCz0lCJ8rhLujVdzY6M6ZWp4iBAc0FxI79cff/pqp8GQAaWFZrs\n" "vQPJ8XqMmN7GRbJ2MDVvyGYwIBtt6RJnr7txfi+JsjI42mujkZdzIEWEOIJrhaqX\n" @@ -64,110 +74,121 @@ const char AUTHORITY_SIGNKEY_1[] = "-----END RSA PRIVATE KEY-----\n"; /** Second of 3 example authority certificates for unit testing. */ -const char AUTHORITY_CERT_2[] = +const char AUTHORITY_CERT_B[] = "dir-key-certificate-version 3\n" -"fingerprint 4D44AE0470B9E88FD4558EFEC82698FB33715400\n" -"dir-key-published 2007-06-13 16:52:32\n" -"dir-key-expires 2008-06-13 16:52:32\n" +"fingerprint AD011E25302925A9D39A80E0E32576442E956467\n" +"dir-key-published 2013-11-14 14:12:05\n" +"dir-key-expires 2014-11-14 14:12:05\n" "dir-identity-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" -"MIIBigKCAYEAqukDwQRm1Oy1pPY+7GNRnRNFJzEVPUBfJwC4tBH19tkvdRQPuIGI\n" -"2jiTy/rmZ6CLcl1G0oulSgxfKEX75QdptOasZu+rKUrRRSxx0QrXhs9a7up0rpXh\n" -"13fw3mh1Vl/As3rJYF30Hjk01BTOJMxi/HY2y0ALQytFWjiMGY74A9Y6+uDcHkB2\n" -"KflBjxIl8zpCsXsTTnUhN5kXqaOOnK46XaUShSpXsyOxTMJXuJEtgLz9XCyA8XjW\n" -"d75QLHucEnlTqxUAdI5YSN2KIlIJiySCVnAorDpJey2mE9VncpHQWMCv/FPFdnSU\n" -"EMMPUc4bBShcoNFf0mMJeV2sv+dBkgKAL0GLM19PuJIThJhfN/B6+YQTxw4HEpPV\n" -"plfUqYRN0fYC+5hCTS6rroO/uCfDR7NBtoeDNm9dQrvjfk3b/Mywah1rdWNjnVqs\n" -"tPJaz3fc/CVBOUUexhmyktgLuwSNEYIQilQ+BydkWN/4RObhV+YSV5BgekEDVaoS\n" -"RHw4IbYBDHVxAgMBAAE=\n" +"MIIBigKCAYEAyXYEMlGNRAixXdg65xf2WPkskYj2Wo8ysKMTls1JCXdIOAPvC2k2\n" +"+AC6i3x9JHzUgCjWr4Jd5PSi7ODGyFC543igYl4wzkxNTU2L+SQ+hMe9qbEuUNhH\n" +"sRR0xofdoH//3UuKj+HXEiMhhHbRWQGtWFuJqtGBruJqjZqIGOrp5nFjdlP0R98n\n" +"Rx5wWlPgdJzifkXjKouu4mV+KzLl7f0gAtngA9DkSjt1wzga5IlL/lxDciD0SyJU\n" +"tKMmls056omrZNbTnBxnY2pOlq9nx/zFrt/KQm1fTAQMjMBCf9KnDIV7NhaaHx7F\n" +"7Nk8L7Hha353SvR+bsOFpiu05/EMZFTTIhO3MhUxZiCVZ0hKXvW1xe0HoGC5wbB+\n" +"NyXu8oa4fIKLJ+WJ8Z60BNc0DcxJiQOf1eolGM/qrBul1lFZznds5/7182d+nF2W\n" +"+bEjSm0fgXIxPfSD/7hB0FvgtmB3TXybHGBfPZgX0sTzFB6LNtP0BHicRoMXKdLF\n" +"hM3tgIjEAsoZAgMBAAE=\n" "-----END RSA PUBLIC KEY-----\n" "dir-signing-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" -"MIGJAoGBAOu3dgrQth3iqvi/UzfywaANw0bBUuMOBhnMBeiLEcRLneJHUJkVvrpR\n" -"/EDQkdMov1e7CX6aqBKygVnbDNYjJ+bcQej8MKpuuW+zIknnz5lfnAVZO5uAmo3Y\n" -"DpG574oQ2FFMdkWHSBloIRxSj/E4Jn1M2qJjElBXP0E33Ka/Noo7AgMBAAE=\n" +"MIGJAoGBAJ567PZIGG/mYWEY4szYi/C5XXvf0BkquzKTHKrqVjysZEys9giz56Gv\n" +"B08kIRxsxYKEWkq60rv0xtTc1WyEMcDpV1WLU0KSTQSVXzLu7BT8jbTsWzGsxdTV\n" +"TdeyOirwHh8Cyyon5lppuMH5twUHrL5O7pWWbxjjrQjAHCn3gd+NAgMBAAE=\n" "-----END RSA PUBLIC KEY-----\n" +"dir-key-crosscert\n" +"-----BEGIN ID SIGNATURE-----\n" +"OC+gaukd4K7xJOsgTPbRhacf5mDUGxsu3ho/J1oJdtni4CK9WscVs6/Goj1o5Lot\n" +"H1nCAMaR96Jnqq5c63Aaj1sEXdeYHlu5cI7YHgtGI5MmtjiUNXUCWMjCwSQYwGKe\n" +"2YDYGAKAGt97n7XMKhJWGjAmv1TgmK3DvL1jt/aazL8=\n" +"-----END ID SIGNATURE-----\n" "dir-key-certification\n" "-----BEGIN SIGNATURE-----\n" -"Fv0Li68QUdAiChY3OklZOakHzwXAUfCzDNxkqe+HLC0n6ZECE9ZCvLVo69XmgVhH\n" -"L5qYr2rxT6QpF+9yuOHbN9gWn8EsDcli06MlhX9TUt/IYVxHa/9tJwNoTfEw2w2D\n" -"tyHhWm94IfOK7/Sea6jHnjckl80X+kk0ZNtAGs3/6fP4iltKNGXnvBwfgLpEgW7X\n" -"NpDl0OLeDuA79zem2GogwQZQdoDbePByU0TJVx9jYi2Bzx2Nb2H0hRTPP6+dY0HQ\n" -"MHb7yyyTQRad5iAUnExKhhyt22p7X3a6lgkAhq4YrNn/zVPkpnT2dzjsOydTHOW8\n" -"2BQs33QlGNe095i47pJBDYsUgmJaXfqB/RG6dFg7jwIsc3/7dZcvcqfxY7wKcD/T\n" -"wtogCIKxDvWbZn7f0hqYkT6uQC8Zom8bcnedmyzufOZCyA2SqQ2wvio6lznR4RIB\n" -"a8qDHR0tPS9/VkqTPcvUWCZeY3UiDeWPjoK1nea1pz6DHDWglKPx86a0amjjayZQ\n" -"-----END SIGNATURE-----\n"; +"BddmCKsvS6VoFXIf9Aj9OZnfyVCx527517QtsQHN+NaVm20LzUkJ5MWGXYx4wgh3\n" +"ExsHvVQguiVfnonkQpEHHKg+TbldlkuDhIdlb9f7dL7V3HLCsEdmS1c3A+TEyrPH\n" +"i44p6QB5IMFAdgUMV/9ueKMh7pMoam6VNakMOd+Axx9BSJTrCRzcepjtM4Z0cPsj\n" +"nmDgZi0df1+ca1t+HnuWyt3trxlqoUxRcPZKz28kEFDJsgnRNvoHrIvNTuy9qY4x\n" +"rONnPuLr5kTO7VQVVZxgxt6WX3p6d8tj+WYHubydr2pG0dwu2vGDTy4qXvDIm/I4\n" +"Gyo6OAoPbYV8fl0584EgiEbAWcX/Pze8mXr9lmXbf73xbSBHqveAs0UfB+4sBI98\n" +"v4ax4NZkGs8cCIfugtAOLgZE0WCh/TQYnQ3PFcrUtj0RW+tM1z7S8P3UfEVBHVkJ\n" +"8SqSB+pbsY6PwMuy6TC3WujW7gmjVanbwkbW19El9l9jRzteFerz7grG/WQkshqF\n" + "-----END SIGNATURE-----\n"; /** The private signing key for AUTHORITY_CERT_2 */ -const char AUTHORITY_SIGNKEY_2[] = +const char AUTHORITY_SIGNKEY_B[] = "-----BEGIN RSA PRIVATE KEY-----\n" -"MIICXgIBAAKBgQDrt3YK0LYd4qr4v1M38sGgDcNGwVLjDgYZzAXoixHES53iR1CZ\n" -"Fb66UfxA0JHTKL9Xuwl+mqgSsoFZ2wzWIyfm3EHo/DCqbrlvsyJJ58+ZX5wFWTub\n" -"gJqN2A6Rue+KENhRTHZFh0gZaCEcUo/xOCZ9TNqiYxJQVz9BN9ymvzaKOwIDAQAB\n" -"AoGAJ+I9/ex8tCfTSA2PdisEKiHKBeHWNYb870Z/RW6qje1BhLUOZSixwfL3XLwt\n" -"wG3nml+SZrKid69uhZaz4FPIf0tqCgURf6dDrF5vuzzr7VLVqkZHYSBp0vE6bu0R\n" -"Sgc5QNxI2talgc4bsp0O0C+Zd4n3Yto0pXl/I6NHVAxlFBECQQD2mahkY+QEHWPV\n" -"yRY3w3HhRmWBcrkY2zVyvPpqfn/sdHRPYW/yj4Xr/d1CO9VyFmEs4k324lIvu6LT\n" -"WDdpPlcJAkEA9LOZv5aNeAm8ckvvXH7iv8KiONiSz0n9wlisxMhNYTEkOCo1g7jG\n" -"AX5ZknRC9s4sWCPOBpMhloUvemdQ5FCEIwJBAMqCFwoSCf7jD8hRcUBr7QodoF/0\n" -"kVJ7OeI2lMJ9jZnlbFp/3snn2Qeam2e38SnWfQi582KKKwnt4eIDMMXpntkCQQDI\n" -"v1Lh11wl3y7nQZ6T7lCNatp08k+2mQgCWYcbRQweMRd6sD4I2xwt+372ZETPfyLo\n" -"CC+sOyYx+v+RVpMJS3irAkEA6l98nMteZKmhOgyKSjdolP+ahpZunb+WnCdAtP97\n" -"rjZyXmEZS3oe7TRCDD28GAGMmxSDvNfOOpyn14ishEs5AQ==\n" +"MIICWwIBAAKBgQCeeuz2SBhv5mFhGOLM2IvwuV1739AZKrsykxyq6lY8rGRMrPYI\n" +"s+ehrwdPJCEcbMWChFpKutK79MbU3NVshDHA6VdVi1NCkk0ElV8y7uwU/I207Fsx\n" +"rMXU1U3Xsjoq8B4fAssqJ+ZaabjB+bcFB6y+Tu6Vlm8Y460IwBwp94HfjQIDAQAB\n" +"AoGAfHQ4ZmfTmPyoeGHcqdVcgBxxh3gJqdnezCavGqGQO3F+CqDBTbBKNLSI3uOW\n" +"hQX+TTK23Xy9RRFCm6MYj3F4x7OOrSHSFyhMmzRnAZi3zGbtQZn30XoqTwCmVevY\n" +"p5JbVvhP2BJcvdsyQhiIG23FRQ7MMHWtksAxmovTto1h/hkCQQDNCfMqSztgJZDn\n" +"JSf5ASHBOw8QzfZBeYi3hqfiDtAN1RxT1uQnEiFQFJqwCz5lCbcwVrfQbrrk5M+h\n" +"ooYrX7tTAkEAxd6Tl0N0WM3zCKz+3/Hoiyty6olnnpzNoPCg7LLBJcetABQi0KUv\n" +"swYWlKP3eOFZkiBzTqa9nBK7eYLKV3d9nwJAKNM3WI98Nguky3FJgTnpd6kDuevY\n" +"gXbqcuhb2xXp9Sceqc7axLDGc0R2/GBwvvttPzG1DcpOai7o7J0Iq/A2wwJAYuKI\n" +"/99GFdtWyc8q0OAkRui/1VY14p6aZQPcaG4s+KSBYLivbXYgEGfKgR4wXsi/6rcs\n" +"6PGLcKQr7N3gITYmIQJAaQn6djUWygCn1noKyWU+Sa7G5qqU2GWkLq9dMaRLm1/I\n" +"nqi+2K1mN15rra0QtFVqSH4JXr8h3KAGyU45voGM7A==\n" "-----END RSA PRIVATE KEY-----\n"; /** Third of 3 example authority certificates for unit testing. */ -const char AUTHORITY_CERT_3[] = +const char AUTHORITY_CERT_C[] = "dir-key-certificate-version 3\n" -"fingerprint ED3719BF554DE9D7D59F5CA5A4F5AD121D020ED9\n" -"dir-key-published 2007-06-13 16:52:40\n" -"dir-key-expires 2008-06-13 16:52:40\n" +"fingerprint 628C2086EC29C9D26E638C5A8B2065BFBD35829B\n" +"dir-key-published 2013-11-14 14:12:18\n" +"dir-key-expires 2014-11-14 14:12:18\n" "dir-identity-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" -"MIIBigKCAYEAtB+yw4BNxtZAG4cPaedkhWNmeij7IuNWmXjh58ZYEGurvGyHs1w4\n" -"QlwNYI2UftSIeIGdWZ5fJ17h9P3xvO6eeJuOt4KPrNOxUbSGrELEx1Lje1fDAJ1X\n" -"SvN+dvptusxtyFUr8afgTPrFIvYuazQ6q/Rw+NDagjmDx3h/A/enihpBnjwzeH8j\n" -"Xzu7b+HKnzFnNfveTDdvSy0NSC6tCOnrfXo31XbXRXtlesnMIpbJClUcAv55eyai\n" -"/PrVPCCUz8mk0sQnn2Xhv1YJmwOlQTGMfg0a0kWLmh+UWcHsGQ4VWxBZJcuzgFHG\n" -"hu2/Fz6DXSpX5Q6B9HKoGmnH1oBh24l0kUW1jL8BxPY4YDU1Lt5t3qgcDn9dXYcI\n" -"o8VvyI0ecSc26Q2PYFWX1hpN4VIBZ8uGaW3IpyTdNiRq0g3iMGRFEXcDlWuyMB9E\n" -"EbSM7m/79V/z7SjDd75EP8Z0qDPESEVB8a8LbuSJtzFVE0KHd7RzkIEN5sorXspZ\n" -"/THukftSmkIvAgMBAAE=\n" +"MIIBigKCAYEAuzPA82lRVUAc1uZgfDehhK0rBU5xt+qhJXUSH0DxsuocYCLW//q+\n" +"7+L7q9SochqZK3R5+SxJaZRlVK4rAeIHsxXFxsnGvuqasGM3he80EV1RpVRkvLaO\n" +"2dDmHcfEjYBadft2DEq811yvqSRqbFXmK0hLucA6LI6NnEw9VNWlguaV6ACVLyKQ\n" +"iYVFz2JOJIAi0Zz57WZg7eHypUAGoyXjtYTJPsh6pUe/0NLFJVd3JHcJX+bNqU2a\n" +"QU37r+CQ9f3T+8fZGJQ/CXNnYUNHa0j+toOFuPEiZBBh8C4PE7FJWjidvhe9uI7T\n" +"Py41RZhy8e05MAQmUBNRKBHWPKHoy2zWZZxTkcfWFdJJz/dzsNrIjrqf2fYId9To\n" +"fDpHzYd/UjzZaaVYRVS/Oyf3pN8DKw8LMhEArS0X9pblPVkWWjmYMU6f0VR7pelc\n" +"gGYuML3gOiKdNbeMWgAv3HNRsVsuW0HZLrhXUGYzTRPJ/GxVCwA/NmYgMTNVWRwF\n" +"7M78YHpayyEPAgMBAAE=\n" "-----END RSA PUBLIC KEY-----\n" "dir-signing-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" -"MIGJAoGBANrSZlUq38Boz3iuUOydYTJV57rTbq1bz805FP2QG2Z+2bwpgKIOZag/\n" -"gN2A1ySJaIYLgZIg9irxrLkqlY/UAjC23y6V9fJXP1S3TXoqLmHleW8PsaDLuwTo\n" -"hCWaR61Mx9WG7IXcodn2Z7RiCfZpSW4Rztbk5WtjQa5jPXSFOuBJAgMBAAE=\n" +"MIGJAoGBANESf/hRRWCK3TLQyNb9Y42tYedCORUc8Rl+Q4wrvdz3R0TNr6rztE9N\n" +"u8v3Wbvjtiqm1xL1I5PaOObFQQj61QZxKiCm1yU4eFH15dNmcvBEy5BjEXVYiDgy\n" +"zKRyePzjHYQIZF3ZaQTABUplkXVpY0YvAurluhEy+dKEvZMwWFZTAgMBAAE=\n" "-----END RSA PUBLIC KEY-----\n" +"dir-key-crosscert\n" +"-----BEGIN ID SIGNATURE-----\n" +"NHNBya6Dt7Ww3qSGA0DBEl6pZFBzmYXM+QdqF+ESpdyYCQ54EYimaxl4VcXoGaxy\n" +"xk8/VOXPC6h7hVnTWDTsC86G6eXug1yzpd/uhQbcDJMH5q8/Yg5WXGOnGhMWNCBh\n" +"u2UmbtAjdjLrObQaB50FfOpuOV9kdG4SEzaPUBR2ayU=\n" +"-----END ID SIGNATURE-----\n" "dir-key-certification\n" "-----BEGIN SIGNATURE-----\n" -"UNXZy+4OQ8iat+gw+vg2ynvKj2BYbqZt+EAZAV3rmw6gux44U9TLRECRd6LsA08N\n" -"4+Vz01TU81xqMgfrUy94ei2YvcfpO8art9/muWHTP9SmOX8S1uqDqLWA+n723C9A\n" -"HyVXn4aINncO2081gJcIW5+Ul8WTCeZe/n3LVPTCKbTdqxvmrPUdCWlJTQUmb19M\n" -"T+kcCjaEfgQGLC+Y2MHqYe/nxz+aBKqpjiWUDdjc35va6r/2e3c0jGi1B1xRZxN1\n" -"xThPZ+CifjDoWBxJdDGlIfZRK1lMnOCJY9w9ibTXQ1UnvE4whFvmB55/t9/XLq4q\n" -"3pnZz0H7funey3+ilmTxDohoAYT1GX+4a+3xYH07UmAFqlTzqKClj84XEHn+Cer7\n" -"Nun9kJlJFuBgUpQjwCkzedFZKKLOHgB2h7trJfnqcBpAM8Rup1Bb5u/RcBx9gy1q\n" -"pMc65FviIrc/Q5TUku6NNbCbnGll1599PvWuUzkG42lJ17V6psKHIsqGtVdHlCUc\n" +"NocTkLl9iKglVo+yrpY0slsqgPviuScMyEfOJ3i65KeJb4Dr1huIs0Fip40zFD8D\n" +"cz/SYu09FbANuRwBJIRdVWZLLwVFLBj5F8U65iJRAPBw/O/xgSVBvWoOhBUZqmJA\n" +"Jp1IUutQHYFfnAOO9za4r8Ox6yPaOWF9Ks5gL0kU/fI8Bdi5E9p3e9fMtoM7hROg\n" +"oX1AoV/za3LcM0oMsGsdXQ7B8vRqY0eUX523kpRpF1fUDyvBUvvMsXdZDN6anCV6\n" +"NtSq2UaM/msTX1oQ8gzyD1gMXH0Ek26YMhd+6WZE6KUeb1x5HJgXtKtYzMLB6nQM\n" +"4Q/OA4NND/Veflofy6xx8uzXe8H+MoUHK9WiORtwqvBl0E9qk6SVCuo4ipR4Ybgk\n" +"PAFOXA58j80dlNYYEVgV8MXF1Y/g/thuXlf2dWiLAExdHTtE0AzC4quWshegaImC\n" +"4aziHeA43TRDszAXcJorREAM0AhSxp3aWDde4Jt46ODOJR8t+gHreks29eDttEIn\n" "-----END SIGNATURE-----\n"; /** The private signing key for AUTHORITY_CERT_3 */ -const char AUTHORITY_SIGNKEY_3[] = +const char AUTHORITY_SIGNKEY_C[] = "-----BEGIN RSA PRIVATE KEY-----\n" -"MIICXgIBAAKBgQDa0mZVKt/AaM94rlDsnWEyVee6026tW8/NORT9kBtmftm8KYCi\n" -"DmWoP4DdgNckiWiGC4GSIPYq8ay5KpWP1AIwtt8ulfXyVz9Ut016Ki5h5XlvD7Gg\n" -"y7sE6IQlmketTMfVhuyF3KHZ9me0Ygn2aUluEc7W5OVrY0GuYz10hTrgSQIDAQAB\n" -"AoGBAIyoeG1AnQmildKeQpiGZackf0uhg2BeRwpFKg//5Q0Sd0Wza+M/2+q1v1Ei\n" -"86ihxxV7KfPTykk6hmuUSwVkI28Z+5J9NYTr35EzPiUlqpo0iclTkFqrlbqSPULx\n" -"9fQhvcOGv1c0m5CnYrHsM8eu3tagLg+6OE4abLOYX4Az5pkxAkEA/NwHhVaVJrXH\n" -"lGDrRAfGtaD5Tzeeg1H9DNZi5lmFiSNR0O11sgDLkiZNP5oM8knyqo8Gq08hwxEb\n" -"yqMXM3XtJQJBAN2KJbFhOjDIkvJyYvbmcP6P7vV2c9j+oUTKkFMF7vvfWunxMi9j\n" -"ghbdUKgl7tU0VFpw7ufDDD0pkN6sua3gp1UCQQCvNzTK861U7p/GtMYyFQVf9JTt\n" -"jMf9jYHBNInBvwTme6AFG5bz6tMlif77dJ9GAXHzODrR2Hq3thJA/3RjR3M1AkBg\n" -"+6M4ncmtpYC+5lhwob0Bk90WU/6vFflfdhXsYoKWfNb95vsDR9qhS82Nbt25NClh\n" -"VmMfzoFDHTkwYgj/F4PpAkEA+RaaSRP7BmbvFNqvlm8J/m0RVdAH4+p/Q5Z5u6Yo\n" -"N7xC/gFi0qFPGKsDvD2CncAYmt+KNsd8S0JGDN4eieKn+Q==\n" +"MIICXAIBAAKBgQDREn/4UUVgit0y0MjW/WONrWHnQjkVHPEZfkOMK73c90dEza+q\n" +"87RPTbvL91m747YqptcS9SOT2jjmxUEI+tUGcSogptclOHhR9eXTZnLwRMuQYxF1\n" +"WIg4Msykcnj84x2ECGRd2WkEwAVKZZF1aWNGLwLq5boRMvnShL2TMFhWUwIDAQAB\n" +"AoGAU68L+eDN3C65CzX2rdcOmg7kOSSQpJrJBmM7tkdr3546sJeD0PFrIrMCkEmZ\n" +"aVNj/v545+WnL+8RB4280lNUIF4AMNaMZUL+4FAtwekqWua3QvvqgRMjCdG3/h/d\n" +"bOAUiiKKEimflTaIVHNVSCvOIntftOu3PhebctuabnZzg0ECQQD9i+FX7M9UXT1A\n" +"bVm+bRIJuQtG+u9jD3VxrvHsmh0QnOAL3oa/ofTCwoTJLZs8Qy0GeAoJNf28rY1q\n" +"AgNMEeEXAkEA0xhxNX2fDQ2yvKwPkPMrRycJVWry+KHvSZG2+XYh+V5sVGQ5H7Gu\n" +"krc6IzRZlIKQhEGktkw8ih0DEHQbAihiJQJBAKi/SnFcePjrPXL91Hb63MB/2dOZ\n" +"+21wwnexOe6A+8ssvajop8IvJlnhYMMMiX7oLrVZe0R6HLBQyge94zfjxm0CQGye\n" +"dRIrE34qAEBo4JGbLjesdHcJUwBwgqn+WoI+MPkZhvBdqa8PRF6l/TpEI5vxGt+S\n" +"z2gmDjia+QqsU4FmuikCQDDOs85uwNSKJFax9XMzd1qd1QwX20F8lvnOsWErXiDw\n" +"Fy2+rmIRHoSxn4D+rE5ivqkO99E9jAlz+uuQz/6WqwE=\n" "-----END RSA PRIVATE KEY-----\n"; - diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 56ac3b3..ead6463 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1244,7 +1244,6 @@ test_a_networkstatus( /* Parse certificates and keys. */ cert1 = authority_cert_parse_from_string(AUTHORITY_CERT_1, NULL); test_assert(cert1); - test_assert(cert1->is_cross_certified); cert2 = authority_cert_parse_from_string(AUTHORITY_CERT_2, NULL); test_assert(cert2); cert3 = authority_cert_parse_from_string(AUTHORITY_CERT_3, NULL);

1 0

[tor/master] Tweak #10162 documentation a bit
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit ec9d88e5a219e4661aab05af56c78947c46cda99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 13:26:58 2013 -0500 Tweak #10162 documentation a bit --- changes/prop157-require | 2 +- src/or/routerparse.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/changes/prop157-require b/changes/prop157-require index 0c35f64..f04806d 100644 --- a/changes/prop157-require +++ b/changes/prop157-require @@ -2,4 +2,4 @@ - Clients now reject any directory authority certificates lacking a dir-key-crosscert element. These have been included since 0.2.1.9-alpha, so there's no real reason for them to be optional - any longer. Completes proposal 157. \ No newline at end of file + any longer. Completes proposal 157. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 8691752..6d83715 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1737,8 +1737,6 @@ authority_cert_parse_from_string(const char *s, const char **end_of_string) } tok = find_by_keyword(tokens, K_DIR_KEY_CROSSCERT); - /* XXXX Once all authorities generate cross-certified certificates, - * make this field mandatory. */ if (check_signature_token(cert->cache_info.identity_digest, DIGEST_LEN, tok,

1 0

[tor/master] Merge branch 'finish_prop157'
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit a7c9d64fd683beeb2e88445399375cac2bee9495 Merge: 3cdd796 ec9d88e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 13:27:06 2013 -0500 Merge branch 'finish_prop157' changes/prop157-require | 5 ++ src/or/or.h | 3 - src/or/routerparse.c | 23 +++--- src/test/test_data.c | 181 ++++++++++++++++++++++++++--------------------- src/test/test_dir.c | 1 - 5 files changed, 115 insertions(+), 98 deletions(-) diff --cc src/test/test_data.c index 3c68b12,71f001d..9aef106 --- a/src/test/test_data.c +++ b/src/test/test_data.c @@@ -63,28 -73,23 +73,28 @@@ const char AUTHORITY_SIGNKEY_A[] "Yx4lqK0ca5IkTp3HevwnlWaJgbaOTUspCVshzJBhDA==\n" "-----END RSA PRIVATE KEY-----\n"; +const char AUTHORITY_SIGNKEY_1_DIGEST[] = + "CBF56A83368A5150F1A9AAADAFB4D77F8C4170E2"; +const char AUTHORITY_SIGNKEY_1_DIGEST256[] = + "AF7C5468DBE3BA54A052726038D7F15F3C4CA511B1952645B3D96D83A8DFB51C"; + /** Second of 3 example authority certificates for unit testing. */ - const char AUTHORITY_CERT_2[] = + const char AUTHORITY_CERT_B[] = "dir-key-certificate-version 3\n" - "fingerprint 4D44AE0470B9E88FD4558EFEC82698FB33715400\n" - "dir-key-published 2007-06-13 16:52:32\n" - "dir-key-expires 2008-06-13 16:52:32\n" + "fingerprint AD011E25302925A9D39A80E0E32576442E956467\n" + "dir-key-published 2013-11-14 14:12:05\n" + "dir-key-expires 2014-11-14 14:12:05\n" "dir-identity-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" - "MIIBigKCAYEAqukDwQRm1Oy1pPY+7GNRnRNFJzEVPUBfJwC4tBH19tkvdRQPuIGI\n" - "2jiTy/rmZ6CLcl1G0oulSgxfKEX75QdptOasZu+rKUrRRSxx0QrXhs9a7up0rpXh\n" - "13fw3mh1Vl/As3rJYF30Hjk01BTOJMxi/HY2y0ALQytFWjiMGY74A9Y6+uDcHkB2\n" - "KflBjxIl8zpCsXsTTnUhN5kXqaOOnK46XaUShSpXsyOxTMJXuJEtgLz9XCyA8XjW\n" - "d75QLHucEnlTqxUAdI5YSN2KIlIJiySCVnAorDpJey2mE9VncpHQWMCv/FPFdnSU\n" - "EMMPUc4bBShcoNFf0mMJeV2sv+dBkgKAL0GLM19PuJIThJhfN/B6+YQTxw4HEpPV\n" - "plfUqYRN0fYC+5hCTS6rroO/uCfDR7NBtoeDNm9dQrvjfk3b/Mywah1rdWNjnVqs\n" - "tPJaz3fc/CVBOUUexhmyktgLuwSNEYIQilQ+BydkWN/4RObhV+YSV5BgekEDVaoS\n" - "RHw4IbYBDHVxAgMBAAE=\n" + "MIIBigKCAYEAyXYEMlGNRAixXdg65xf2WPkskYj2Wo8ysKMTls1JCXdIOAPvC2k2\n" + "+AC6i3x9JHzUgCjWr4Jd5PSi7ODGyFC543igYl4wzkxNTU2L+SQ+hMe9qbEuUNhH\n" + "sRR0xofdoH//3UuKj+HXEiMhhHbRWQGtWFuJqtGBruJqjZqIGOrp5nFjdlP0R98n\n" + "Rx5wWlPgdJzifkXjKouu4mV+KzLl7f0gAtngA9DkSjt1wzga5IlL/lxDciD0SyJU\n" + "tKMmls056omrZNbTnBxnY2pOlq9nx/zFrt/KQm1fTAQMjMBCf9KnDIV7NhaaHx7F\n" + "7Nk8L7Hha353SvR+bsOFpiu05/EMZFTTIhO3MhUxZiCVZ0hKXvW1xe0HoGC5wbB+\n" + "NyXu8oa4fIKLJ+WJ8Z60BNc0DcxJiQOf1eolGM/qrBul1lFZznds5/7182d+nF2W\n" + "+bEjSm0fgXIxPfSD/7hB0FvgtmB3TXybHGBfPZgX0sTzFB6LNtP0BHicRoMXKdLF\n" + "hM3tgIjEAsoZAgMBAAE=\n" "-----END RSA PUBLIC KEY-----\n" "dir-signing-key\n" "-----BEGIN RSA PUBLIC KEY-----\n"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2013