June 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Copy the xmppRegister patches during build
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit 42cfd751ce9e04d7468baf32685cb0387a4087fd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 14:28:51 2015 -0400 Copy the xmppRegister patches during build --- projects/instantbird/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index a7f9b4a..843a0b6 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -51,6 +51,8 @@ done cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt cp ../cert_override.txt im/app/profile +cp ../xmppRegister* im/content/ + cp ../branding/default*.png im/branding/messenger/gtk/ cp ../branding/convWindow*.png im/branding/messenger/gtk/ cp ../branding/blistWindow*.png im/branding/messenger/gtk/

1 0

[tor-messenger-build/master] Fix typo in Instantbird config
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit 3f04e14377b6e2f8ab3f9a2504736a27d5f343f8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 14:26:12 2015 -0400 Fix typo in Instantbird config --- projects/instantbird/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 63348dc..3caba4c 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -107,7 +107,7 @@ input_files: - filename: branding/credits.patch - filename: branding/about.png - filename: branding/osx.patch - enable: '[% c("var/osx") %] + enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: f2e7cea9bc6a-bug-1150967.patch

1 0

[tor-messenger-build/master] Add in-band XMPP registration support (#12097)
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit c2f960e563837f6f9e56954cf4dd9f35489b2d13 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 13:56:26 2015 -0400 Add in-band XMPP registration support (#12097) --- projects/instantbird/config | 6 +- .../instantbird/xmpp-inband-registration.patch | 278 ++++++++++++++++++++ projects/instantbird/xmppRegister.js | 127 +++++++++ projects/instantbird/xmppRegister.xul | 25 ++ 4 files changed, 435 insertions(+), 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 656cdb4..63348dc 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -79,6 +79,9 @@ input_files: - filename: cert_override.txt - filename: ctcp-time.patch - filename: ctcp-ping.patch + - filename: xmpp-inband-registration.patch + - filename: xmppRegister.js + - filename: xmppRegister.xul - filename: xmpp-domain.patch - filename: xmpp-resource.patch - filename: xmpp-onion-js.patch @@ -100,10 +103,11 @@ input_files: - filename: branding/default.ico - filename: branding/instantbird.ico - filename: branding/name.patch - - filename: branding/osx.patch - filename: branding/instantbird.icns - filename: branding/credits.patch - filename: branding/about.png + - filename: branding/osx.patch + enable: '[% c("var/osx") %] - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: f2e7cea9bc6a-bug-1150967.patch diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch new file mode 100644 index 0000000..73c838c --- /dev/null +++ b/projects/instantbird/xmpp-inband-registration.patch @@ -0,0 +1,278 @@ +diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties +--- a/chat/locales/en-US/xmpp.properties ++++ b/chat/locales/en-US/xmpp.properties +@@ -8,16 +8,19 @@ + # (These will be displayed in account.connection.progress from + # accounts.properties, which adds … at the end, so do not include + # periods at the end of these messages.) + connection.initializingStream=Initializing stream + connection.initializingEncryption=Initializing encryption + connection.authenticating=Authenticating + connection.gettingResource=Getting resource + connection.downloadingRoster=Downloading contact list ++connection.registering=Registering new account with server ++connection.gettingRegistration=Getting registration form ++connection.onRegistrationSuccess=Account registration successful + + # LOCALIZATION NOTE (connection.error.*) + # These will show in the account manager if an error occurs during the + # connection attempt. + connection.error.invalidUsername=Invalid username (your username should contain an '@' character) + connection.error.failedToCreateASocket=Failed to create a socket (Are you offline?) + connection.error.serverClosedConnection=The server closed the connection + connection.error.resetByPeer=Connection reset by peer +@@ -28,16 +31,18 @@ connection.error.startTLSRequired=The se + connection.error.startTLSNotSupported=The server doesn't support encryption but your configuration requires it + connection.error.failedToStartTLS=Failed to start encryption + connection.error.noAuthMec=No authentication mechanism offered by the server + connection.error.noCompatibleAuthMec=None of the authentication mechanisms offered by the server are supported + connection.error.notSendingPasswordInClear=The server only supports authentication by sending the password in cleartext + connection.error.authenticationFailure=Authentication failure + connection.error.notAuthorized=Not authorized (Did you enter the wrong password?) + connection.error.failedToGetAResource=Failed to get a resource ++connection.error.noRegistrationSupport=The server does not support in-band registration ++connection.error.registrationCancel=Registration canceled + + + # LOCALIZATION NOTE (conversation.error.notDelivered): + # This is displayed in a conversation as an error message when a message + # the user has sent wasn't delivered. + # %S is replaced by the text of the message that wasn't delivered. + conversation.error.notDelivered=This message could not be delivered: %S + # This is displayed in a conversation as an error message when joining a MUC +diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-session.jsm +--- a/chat/protocols/xmpp/xmpp-session.jsm ++++ b/chat/protocols/xmpp/xmpp-session.jsm +@@ -6,16 +6,18 @@ const EXPORTED_SYMBOLS = ["XMPPSession", + + const {classes: Cc, interfaces: Ci, utils: Cu} = Components; + + Cu.import("resource:///modules/imXPCOMUtils.jsm"); + Cu.import("resource:///modules/socket.jsm"); + Cu.import("resource:///modules/xmpp-xml.jsm"); + Cu.import("resource:///modules/xmpp-authmechs.jsm"); + ++const registerWindow = "chrome://instantbird/content/xmppRegister.xul"; ++ + XPCOMUtils.defineLazyGetter(this, "_", function() + l10nHelper("chrome://chat/locale/xmpp.properties") + ); + + // Workaround because a lazy getter can't be exported. + XPCOMUtils.defineLazyGetter(this, "_defaultResource", function() + l10nHelper("chrome://branding/locale/brand.properties")("brandShortName") + ); +@@ -63,16 +65,17 @@ XMPPSession.prototype = { + __proto__: Socket, + connectTimeout: 60, + readWriteTimeout: 300, + sendPing: function() { + this.sendStanza(Stanza.iq("get", null, null, + Stanza.node("ping", Stanza.NS.ping)), + this.cancelDisconnectTimer, this); + }, ++ nodes: {}, + _lastReceiveTime: 0, + _lastSendTime: 0, + checkPingTimer(aJustSentSomething = false) { + // Don't start a ping timer if we're not fully connected yet. + if (this.onXmppStanza != this.stanzaListeners.accountListening) + return; + let now = Date.now(); + if (aJustSentSomething) +@@ -265,28 +268,95 @@ XMPPSession.prototype = { + _("connection.error.startTLSNotSupported")); + return; + } + + // If we aren't starting TLS, jump to the auth step. + this.onXmppStanza = this.stanzaListeners.startAuth; + this.onXmppStanza(aStanza); + }, ++ onRegisterResponse: function(aStanza) { ++ let error = this._account.parseError(aStanza); ++ if (error) { ++ this.onError(null, aStanza.getElement(["error"]).innerText); ++ return; ++ } ++ if (aStanza.attributes["type"] == "result") { ++ this._account.reportConnecting(_("connection.onRegistrationSuccess")); ++ this._account.prefs.setBoolPref("register", false); ++ this._account.connect(); ++ } ++ return; ++ }, ++ startRegister: function(aStanza) { ++ // Some servers do not support in-band registration. In that case, ++ // complain and quit the registration process. ++ let error = this._account.parseError(aStanza); ++ if (error) { ++ this.onError(null, _("connection.error.noRegistrationSupport")); ++ return; ++ } ++ ++ this._account.reportConnecting(_("connection.gettingRegistration")); ++ let registerStanza = aStanza.getChildrenByNS(Stanza.NS.register)[0]; ++ // If we get registration data, show the form, else quit. ++ if (registerStanza.getElement(["x"])) { ++ registerStanza.wrappedJSObject = registerStanza; ++ let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"] ++ .getService(Ci.nsIWindowWatcher); ++ let win = ww.openWindow(null, registerWindow, "", ++ "centerscreen,chrome,modal,minimizable=no", registerStanza); ++ } else { ++ this.onError(null, _("connection.error.noRegistrationSupport")); ++ } ++ ++ // If the user cancelled the form, we should stop the registration. ++ if (this.nodes["cancel"]) ++ this.onError(null, _("connection.error.registrationCancel")); ++ ++ let xml = '<?xml version="1.0"?>'; ++ let fieldNodes = []; ++ for (let key in this.nodes) { ++ let node = Stanza.node("field", null, {"var": key}); ++ let childNode = Stanza.node("value"); ++ childNode.addText(this.nodes[key]); ++ node.addChild(childNode); ++ fieldNodes.push(node); ++ } ++ let registerResponse = Stanza.iq("set", null, this._domain, ++ Stanza.node("query", Stanza.NS.register, null, ++ Stanza.node("x", Stanza.NS.xdata, ++ {"type": "submit"}, fieldNodes))); ++ this.sendStanza(registerResponse); ++ this.onXmppStanza = this.stanzaListeners.onRegisterResponse; ++ }, + startTLS: function(aStanza) { + if (aStanza.localName != "proceed") { + this._networkError(_("connection.error.failedToStartTLS")); + return; + } + + this.startTLS(); + this._encrypted = true; + this.startStream(); + this.onXmppStanza = this.stanzaListeners.startAuth; + }, + startAuth: function(aStanza) { ++ // If the user has requested for a new account, we try to perform ++ // in-band registration first (if the server supports it) and then ++ // we authenticate. ++ if (this._account.getBool("register")) { ++ this._account.reportConnecting(_("connection.registering")); ++ let register = Stanza.iq("get", null, null, ++ Stanza.node("query", Stanza.NS.register)); ++ this.sendStanza(register); ++ this.onXmppStanza = this.stanzaListeners.startRegister; ++ return; ++ } ++ + if (aStanza.localName != "features") { + this.ERROR("Unexpected stanza " + aStanza.localName + ", expected 'features'"); + this._networkError(_("connection.error.incorrectResponse")); + return; + } + + let mechs = aStanza.getElement(["mechanisms"]); + if (!mechs) { +diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js +--- a/im/content/accountWizard.js ++++ b/im/content/accountWizard.js +@@ -106,16 +106,20 @@ var accountWizard = { + }, + + showUsernamePage: function aw_showUsernamePage() { + let proto = this.proto.id; + if ("userNameBoxes" in this && this.userNameProto == proto) { + this.checkUsername(); + return; + } ++ ++ if (this.proto.id == "prpl-jabber") { ++ document.getElementById("registerXMPP").hidden = false; ++ } + + let bundle = document.getElementById("accountsBundle"); + let usernameInfo; + let emptyText = this.proto.usernameEmptyText; + if (emptyText) { + usernameInfo = + bundle.getFormattedString("accountUsernameInfoWithDescription", + [emptyText, this.proto.name]); +@@ -412,16 +416,18 @@ var accountWizard = { + createAccount: function aw_createAccount() { + let acc = Services.accounts.createAccount(this.username, this.proto.id); + if (!this.proto.noPassword && this.password) + acc.password = this.password; + if (this.alias) + acc.alias = this.alias; + //FIXME: newMailNotification + ++ acc.setBool("register", document.getElementById("registerXMPP").checked); ++ + for (let i = 0; i < this.prefs.length; ++i) { + let option = this.prefs[i]; + let opt = option.opt; + switch(opt.type) { + case opt.typeBool: + acc.setBool(option.name, option.value); + break; + case opt.typeInt: +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -60,16 +60,17 @@ + onpageshow="accountWizard.showUsernamePage();" + onpagehide="accountWizard.hideUsernamePage();" + onpagerewound="return accountWizard.rewindFromUsernamePage();"> + <description id="usernameInfo"/> + <separator/> + <vbox id="userNameBox"/> + <separator/> + <description id="duplicateAccount" hidden="true">&accountUsernameDuplicate.label;</description> ++ <checkbox id="registerXMPP" label="&registerXMPP.label;" hidden="true" /> + </wizardpage> + + <wizardpage id="accountpassword" pageid="accountpassword" next="accountadvanced" + label="&accountPasswordTitle.label;"> + <description>&accountPasswordInfo.label;</description> + <separator/> + <hbox id="passwordBox" align="baseline"> + <label value="&accountPasswordField.label;" control="password" id="passwordLabel"/> +diff --git a/im/content/jar.mn b/im/content/jar.mn +--- a/im/content/jar.mn ++++ b/im/content/jar.mn +@@ -56,16 +56,18 @@ instantbird.jar: + content/instantbird/proxies.css + content/instantbird/proxy.xml + * content/instantbird/tabbrowser.xml + content/instantbird/tabbrowser.css + content/instantbird/utilities.js + * content/instantbird/viewlog.xul + content/instantbird/viewlog.js + content/instantbird/viewlog.css ++* content/instantbird/xmppRegister.xul ++ content/instantbird/xmppRegister.js + #ifdef XP_MACOSX + * content/instantbird/hiddenWindow.xul + content/instantbird/menus-mac.xul + content/instantbird/macgestures.js + * content/instantbird/jsConsoleOverlay.xul + * content/instantbird/softwareUpdateOverlay.xul + #elifdef XP_WIN + content/instantbird/menus-win.xul +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +--- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +@@ -26,8 +26,10 @@ + <!ENTITY accountAliasInfo.label "This will only be displayed in your conversations when you talk, remote buddies won't see it."> + <!ENTITY accountProxySettings.caption "Proxy Settings"> + <!ENTITY accountProxySettings.change.label "Change…"> + <!ENTITY accountProxySettings.change.accessKey "C"> + + <!ENTITY accountSummaryTitle.label "Summary"> + <!ENTITY accountSummaryInfo.label "A summary of the information you entered is displayed below. Please check it before the account is created."> + <!ENTITY accountSummary.connectAutomatically.label "Connect this account automatically."> ++ ++<!ENTITY registerXMPP.label "Create this new account on the server"> diff --git a/projects/instantbird/xmppRegister.js b/projects/instantbird/xmppRegister.js new file mode 100644 index 0000000..052fa6c --- /dev/null +++ b/projects/instantbird/xmppRegister.js @@ -0,0 +1,127 @@ +const { interfaces: Ci, utils: Cu, classes: Cc } = Components; + +Cu.import("resource:///modules/imXPCOMUtils.jsm"); +Cu.import("resource:///modules/xmpp-session.jsm"); + +XPCOMUtils.defineLazyGetter(this, "_", function() + l10nHelper("chrome://branding/locale/brand.properties") +); + +let registerAccount = { + createElement: function(aType, aID, aValue) { + let element = document.createElement(aType); + if (aID) + element.setAttribute("id", aID); + if (aValue) + element.setAttribute("value", aValue); + return element; + }, + + createRow: function() { + let row = document.createElement("row"); + row.setAttribute("align", "baseline"); + return row; + }, + + onLoad: function() { + document.documentElement.getButton("accept").disabled = true; + + this.rows = document.getElementById("register-rows"); + + this.nodes = XMPPSession.prototype.nodes; + this.registerStanza = window.arguments[0].wrappedJSObject; + this.dataStanza = this.registerStanza.getElement(["x"]); + + let instructions = this.dataStanza.getElement(["instructions"]); + if (instructions) { + let instructionRow = this.createRow(); + let instructionLabel = this.createElement("label", null, instructions.innerText); + instructionRow.appendChild(instructionLabel); + this.rows.appendChild(instructionRow); + } + + let title = this.dataStanza.getElement(["title"]); + if (title) + document.title = title.innerText; + else + document.title = _("brandShortName"); + + for each (let ele in this.dataStanza.getElements(["field"])) { + let fieldType = ele.attributes["type"]; + switch (fieldType) { + + case "text-single": + case "text-private": + + let textRow = this.createRow(); + let textLabel = this.createElement("label", null, ele.attributes["label"]); + + let textBox = this.createElement("textbox", ele.attributes["var"], + ele.getElement(["value"]) ? ele.getElement(["value"]).innerText : ""); + if (fieldType == "text-private") + textBox.setAttribute("type", "password"); + if (ele.getElement(["required"])) + textBox.setAttribute("oninput", "onInput(this)"); + + textRow.appendChild(textLabel); + textRow.appendChild(textBox); + this.rows.appendChild(textRow); + break; + + case "fixed": + + let fixedRow = this.createRow(); + let fixedLabel = this.createElement("label", null, ele.getElement(["value"]).innerText); + fixedRow.appendChild(fixedLabel); + this.rows.appendChild(fixedRow); + break; + } + } + + // Some forms have an OCR field. In that case, show the OCR image + // and provide input for the same. + let ocr = this.dataStanza.getElements(["field"]).find(e => e.attributes["var"] == "ocr"); + if (ocr) { + let ocrRow = this.createRow(); + let ocrImage = this.createElement("image"); + ocrImage.setAttribute("src", "data:image/png;base64," + this.registerStanza.getElement(["data"]).innerText); + + let ocrLabel = this.createElement("label", null, ocr.attributes["label"]); + let ocrInput = this.createElement("textbox", ocr.attributes["var"], null); + + ocrRow.appendChild(ocrLabel); + ocrRow.appendChild(ocrInput); + this.rows.appendChild(ocrRow); + + let ocrBox = document.createElement("hbox"); + ocrBox.setAttribute("align", "center"); + ocrBox.appendChild(ocrImage); + + let ocrImageRow = this.createRow(); + ocrImageRow.appendChild(ocrBox); + this.rows.appendChild(ocrImageRow); + } + }, + + onSave: function() { + for each (let elements in this.dataStanza.getElements(["field"])) { + if (elements.attributes["var"] != undefined) { + let variable = elements.attributes["var"]; + if (document.getElementById(variable)) + this.nodes[variable] = document.getElementById(variable).value; + else + this.nodes[variable] = elements.getElement(["value"]).innerText; + } + } + delete this.nodes["cancel"]; + }, + + onCancel: function() { + // The form was cancelled so we quit the registration. + this.nodes["cancel"] = true; + }, +}; + +function onInput(e) { + document.documentElement.getButton("accept").disabled = !e.value; +} diff --git a/projects/instantbird/xmppRegister.xul b/projects/instantbird/xmppRegister.xul new file mode 100644 index 0000000..c21bc96 --- /dev/null +++ b/projects/instantbird/xmppRegister.xul @@ -0,0 +1,25 @@ +<?xml version="1.0" ?> +<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?> + +<dialog + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + id="registerDialog" + onload="registerAccount.onLoad()" + buttons="accept,cancel" + ondialogaccept="return registerAccount.onSave()" + ondialogcancel="registerAccount.onCancel()"> + + <script type="application/javascript" src="chrome://instantbird/content/xmppRegister.js" /> + + <grid flex="1"> + + <columns> + <column flex="1" /> + <column flex="1" /> + </columns> + + <rows id="register-rows" /> + + </grid> + +</dialog>

1 0

[tor/master] More tweaks for windows compilation. (ick)
by nickm＠torproject.org 29 Jun '15

29 Jun '15

commit 753797391f789700ccf7ec9123076405f250cb93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:47:44 2015 -0400 More tweaks for windows compilation. (ick) --- src/common/compat.h | 4 ++-- src/common/crypto.c | 1 + src/or/or.h | 1 + src/test/test_containers.c | 26 +++++++++++++------------- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index fbaeb6f..68985d8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -7,12 +7,12 @@ #define TOR_COMPAT_H #include "orconfig.h" -#include "torint.h" -#include "testsupport.h" #ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> #endif +#include "torint.h" +#include "testsupport.h" #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index 984fe95..934679e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -13,6 +13,7 @@ #include "orconfig.h" #ifdef _WIN32 +#include <winsock2.h> #include <windows.h> #include <wincrypt.h> /* Windows defines this; so does OpenSSL 0.9.8h and later. We don't actually diff --git a/src/or/or.h b/src/or/or.h index 0950277..431105b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -67,6 +67,7 @@ #endif #ifdef _WIN32 +#include <winsock2.h> #include <io.h> #include <process.h> #include <direct.h> diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 3d150f5..2ae81bf 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -887,7 +887,7 @@ static void test_container_order_functions(void *arg) { int lst[25], n = 0; - unsigned int lst2[25]; + unsigned int lst_2[25]; // int a=12,b=24,c=25,d=60,e=77; #define median() median_int(lst, n) @@ -910,24 +910,24 @@ test_container_order_functions(void *arg) tt_int_op(25,OP_EQ, median()); /* 12,12,24,25,60,77,77 */ #undef median -#define third_quartile() third_quartile_uint32(lst2, n) +#define third_quartile() third_quartile_uint32(lst_2, n) n = 0; - lst2[n++] = 1; + lst_2[n++] = 1; tt_int_op(1,OP_EQ, third_quartile()); /* ~1~ */ - lst2[n++] = 2; + lst_2[n++] = 2; tt_int_op(2,OP_EQ, third_quartile()); /* 1, ~2~ */ - lst2[n++] = 3; - lst2[n++] = 4; - lst2[n++] = 5; + lst_2[n++] = 3; + lst_2[n++] = 4; + lst_2[n++] = 5; tt_int_op(4,OP_EQ, third_quartile()); /* 1, 2, 3, ~4~, 5 */ - lst2[n++] = 6; - lst2[n++] = 7; - lst2[n++] = 8; - lst2[n++] = 9; + lst_2[n++] = 6; + lst_2[n++] = 7; + lst_2[n++] = 8; + lst_2[n++] = 9; tt_int_op(7,OP_EQ, third_quartile()); /* 1, 2, 3, 4, 5, 6, ~7~, 8, 9 */ - lst2[n++] = 10; - lst2[n++] = 11; + lst_2[n++] = 10; + lst_2[n++] = 11; /* 1, 2, 3, 4, 5, 6, 7, 8, ~9~, 10, 11 */ tt_int_op(9,OP_EQ, third_quartile());

1 0

[torspec/master] Fix minor typos and inconsistencies in 224-rend-spec-ng.txt
by nickm＠torproject.org 29 Jun '15

29 Jun '15

commit 970952fb357651ff531cf4afe646cf89880cfa01 Author: teor <teor2345(a)gmail.com> Date: Mon Jun 29 02:38:50 2015 +1000 Fix minor typos and inconsistencies in 224-rend-spec-ng.txt Fix misspellings, inconsistent field names, and missing INT_8() specifiers. Patch by Tim Wilson-Brown ("teor"). --- proposals/224-rend-spec-ng.txt | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 0b6fde2..020bded 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -232,7 +232,7 @@ Status: Draft 40 -- RELAY_COMMAND_INTRODUCE_ACK - Sent form introduction point to client; acknowledges + Sent from introduction point to client; acknowledges receipt of INTRODUCE1 cell and reports success/failure. Discussed in [INTRO_ACK] @@ -281,6 +281,7 @@ Status: Draft Matthew Finkel George Kadianakis, Peter Palfrader, + Tim Wilson-Brown ("teor"), [XXX Acknowledge the huge bunch of people working on 8106.] @@ -703,8 +704,9 @@ Status: Draft for replicanum in 1...hsdir_n_replicas: hs_index(replicanum) = H("store-at-idx" | - blinded_public_key | replicanum | - periodnum) + blinded_public_key | + INT_8(replicanum) | + INT_8(periodnum) ) where blinded_public_key is specified in section KEYBLIND, and periodnum is defined in section TIME-PERIODS. @@ -974,7 +976,7 @@ Status: Draft N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] - EXT_FIELD [EXTRA_FIELD_LEN bytes] + EXT_FIELD [EXT_FIELD_LEN bytes] HANDSHAKE_AUTH [MAC_LEN bytes] SIGLEN [1 byte] SIG [SIGLEN bytes] @@ -1173,7 +1175,7 @@ Status: Draft N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] - EXT_FIELD [EXTRA_FIELD_LEN bytes] + EXT_FIELD [EXT_FIELD_LEN bytes] ENCRYPTED [Up to end of relay payload] [TODO: Should we have a field to determine the type of ENCRYPTED, or @@ -1208,7 +1210,7 @@ Status: Draft N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] - EXT_FIELD [EXTRA_FIELD_LEN bytes] + EXT_FIELD [EXT_FIELD_LEN bytes] Recognized status values are: [00 00] -- Success: cell relayed to hidden service host. @@ -1234,7 +1236,7 @@ Status: Draft EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] - EXT_FIELD [EXTRA_FIELD_LEN bytes] + EXT_FIELD [EXT_FIELD_LEN bytes] ENCRYPTED [Up to end of relay payload] @@ -1274,7 +1276,7 @@ Status: Draft N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] - EXT_FIELD [EXTRA_FIELD_LEN bytes] + EXT_FIELD [EXT_FIELD_LEN bytes] ONION_KEY_TYPE [2 bytes] ONION_KEY [depends on ONION_KEY_TYPE] NSPEC (Number of link specifiers) [1 byte] @@ -1381,7 +1383,7 @@ Status: Draft N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] - EXT_FIELD [EXTRA_FIELD_LEN bytes] + EXT_FIELD [EXT_FIELD_LEN bytes] ENCRYPTED: CLIENT_PK [G_LENGTH bytes] ENCRYPTED_DATA [Padded to length of plaintext] @@ -1575,7 +1577,7 @@ Status: Draft end-to-end traffic encryption and authentication as in the regular Tor relay encryption protocol, applying encryption with these keys before other encryption, and decrypting with these keys before other - encryption. The client encrypts with Kf and decrypts with Kb; the + decryption. The client encrypts with Kf and decrypts with Kb; the service host does the opposite. 6. Open Questions:

1 0

[torspec/master] Consistently use _LEN in 224-rend-spec-ng.txt
by nickm＠torproject.org 29 Jun '15

29 Jun '15

commit 91b3a67ace4e20c4d2ffb37b8f15295dab75939d Author: teor <teor2345(a)gmail.com> Date: Mon Jun 29 02:41:59 2015 +1000 Consistently use _LEN in 224-rend-spec-ng.txt Use _LEN rather than _LENGTH for field lengths in 224-rend-spec-ng.txt. (8 replacements made.) Patch by Tim Wilson-Brown ("teor"). --- proposals/224-rend-spec-ng.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 020bded..ecdae13 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1044,12 +1044,12 @@ Status: Draft In this older protocol, an ESTABLISH_INTRO cell contains: - KEY_LENGTH [2 bytes] - KEY [KEY_LENGTH bytes] + KEY_LEN [2 bytes] + KEY [KEY_LEN bytes] HANDSHAKE_AUTH [20 bytes] SIG [variable, up to end of relay payload] - The KEY_LENGTH variable determines the length of the KEY field. + The KEY_LEN variable determines the length of the KEY field. The KEY field is a ASN1-encoded RSA public key. @@ -1060,7 +1060,7 @@ Status: Draft earlier fields. Note that since the relay payload itself may be no more than 498 - bytes long, the KEY_LENGTH field can never have a first byte other + bytes long, the KEY_LEN field can never have a first byte other than [00] or [01]. These values are used to distinguish legacy ESTABLISH_INTRO cells from newer ones. @@ -1369,7 +1369,7 @@ Status: Draft and sends, as the ENCRYPTED part of the INTRODUCE1 cell: - CLIENT_PK [G_LENGTH bytes] + CLIENT_PK [G_LEN bytes] ENCRYPTED_DATA [Padded to length of plaintext] MAC [MAC_LEN bytes] @@ -1385,7 +1385,7 @@ Status: Draft EXT_FIELD_LEN [1 byte] EXT_FIELD [EXT_FIELD_LEN bytes] ENCRYPTED: - CLIENT_PK [G_LENGTH bytes] + CLIENT_PK [G_LEN bytes] ENCRYPTED_DATA [Padded to length of plaintext] MAC [MAC_LEN bytes] @@ -1436,8 +1436,8 @@ Status: Draft (The above are used to finish the ntor handshake.) The server's handshake reply is: - SERVER_PK Y [G_LENGTH bytes] - AUTH H(auth_input, t_mac) [H_LENGTH bytes] + SERVER_PK Y [G_LEN bytes] + AUTH H(auth_input, t_mac) [H_LEN bytes] These faileds can be send to the client in a RENDEZVOUS1 cell. (See [JOIN_REND] below.)

1 0

[torspec/master] Fix a misspelling in tor-spec.txt
by nickm＠torproject.org 29 Jun '15

29 Jun '15

commit f9ca8b473ece5934cccafcb9ab21b6e872ca23d6 Author: teor <teor2345(a)gmail.com> Date: Mon Jun 29 02:46:17 2015 +1000 Fix a misspelling in tor-spec.txt Patch by Tim Wilson-Brown ("teor"). --- tor-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-spec.txt b/tor-spec.txt index de5387e..27c933d 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1128,7 +1128,7 @@ see tor-design.pdf. but it probably won't get fixed until a later version of Tor. Thus, clients SHOULD NOT send a TRUNCATE cell to a node running any current version of Tor if a) they have sent relay cells through that node, - and b) they aren't sure whether those cells have been sent on yes.] + and b) they aren't sure whether those cells have been sent on yet.] When an unrecoverable error occurs along one connection in a circuit, the nodes on either side of the connection should, if they

1 0

[tor-messenger-build/master] Simplify Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
by boklm＠torproject.org 29 Jun '15

29 Jun '15

commit 9cfd49c575c05e92bb83f148cf11c0199febfb6b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 29 19:16:22 2015 +0200 Simplify Bug-9173-Change-the-default-Firefox-profile-director.mozpatch (noticed by Arlo) --- ...e-the-default-Firefox-profile-director.mozpatch | 40 +++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index e5c78bc..d531b91 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -1,4 +1,4 @@ -From e40c55e5d4c8ea9e354f00277478accae84970de Mon Sep 17 00:00:00 2001 +From 37cc1ee63479d97b6605ff86e0a99bcb1be14121 Mon Sep 17 00:00:00 2001 From: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri, 18 Oct 2013 15:20:06 -0400 Subject: [PATCH] Bug #9173: Change the default Firefox profile directory to be @@ -7,14 +7,14 @@ Subject: [PATCH] Bug #9173: Change the default Firefox profile directory to be This should eliminate our need to rely on a wrapper script that sets $HOME and launches Firefox with -profile. --- - toolkit/xre/nsXREDirProvider.cpp | 153 ++++++++------------------------- + toolkit/xre/nsXREDirProvider.cpp | 150 +++++++-------------------------- toolkit/xre/nsXREDirProvider.h | 10 +-- xpcom/io/moz.build | 4 + - xpcom/io/nsAppFileLocationProvider.cpp | 96 ++++++++------------- - 4 files changed, 79 insertions(+), 184 deletions(-) + xpcom/io/nsAppFileLocationProvider.cpp | 93 ++++++++------------ + 4 files changed, 73 insertions(+), 184 deletions(-) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index c496a14ce84a..689cb0f8ecb1 100644 +index c496a14ce84a..c3cb676f7184 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -33,6 +33,7 @@ @@ -45,7 +45,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -1212,82 +1207,45 @@ nsresult +@@ -1212,82 +1207,42 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) @@ -75,9 +75,6 @@ index c496a14ce84a..689cb0f8ecb1 100644 - nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(localDir); - NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED); + int levelsToRemove = 1; // In FF21+, appDir points to browser subdirectory. -+#if defined(XP_MACOSX) -+ levelsToRemove += 1; -+#endif + while (localDir && (levelsToRemove > 0)) { + // When crawling up the hierarchy, components named "." do not count. + nsAutoCString removedName; @@ -100,16 +97,16 @@ index c496a14ce84a..689cb0f8ecb1 100644 - rv = GetShellFolderPath(CSIDL_LOCAL_APPDATA, path); - if (NS_FAILED(rv)) - rv = GetRegWindowsAppDataFolder(aLocal, path); -+ if (didRemove) -+ --levelsToRemove; - } +- } - if (!aLocal || NS_FAILED(rv)) { - rv = GetShellFolderPath(CSIDL_APPDATA, path); - if (NS_FAILED(rv)) { - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } -- } ++ if (didRemove) ++ --levelsToRemove; + } - NS_ENSURE_SUCCESS(rv, rv); - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); @@ -154,7 +151,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 NS_IF_ADDREF(*aFile = localDir); return rv; -@@ -1500,48 +1458,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1500,48 +1455,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, } nsAutoCString profile; @@ -206,7 +203,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 #elif defined(ANDROID) // The directory used for storing profiles -@@ -1553,12 +1488,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1553,12 +1485,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) @@ -219,7 +216,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); -@@ -1567,31 +1496,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1567,31 +1493,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, // On the off chance that someone wanted their folder to be hidden don't // let it become ".." @@ -304,7 +301,7 @@ index b4dfc03b4683..6e1936fe8666 100644 + GENERATED_INCLUDES += ['..'] diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index a5c71e723907..f93e7f430996 100644 +index a5c71e723907..e71e653b08ab 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -14,6 +14,7 @@ @@ -327,7 +324,7 @@ index a5c71e723907..f93e7f430996 100644 //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, -@@ -295,48 +295,45 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -295,48 +295,42 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, bool exists; nsCOMPtr<nsIFile> localDir; @@ -342,9 +339,6 @@ index a5c71e723907..f93e7f430996 100644 + NS_ENSURE_SUCCESS(rv, rv); + + int levelsToRemove = 1; // In FF21+, bin dir points to browser subdirectory. -+#if defined(XP_MACOSX) -+ levelsToRemove += 1; -+#endif + while (localDir && (levelsToRemove > 0)) { + // When crawling up the hierarchy, components named "." do not count. + nsAutoCString removedName; @@ -409,7 +403,7 @@ index a5c71e723907..f93e7f430996 100644 rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { -@@ -356,10 +353,6 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -356,10 +350,6 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, //---------------------------------------------------------------------------------------- // GetDefaultUserProfileRoot - Gets the directory which contains each user profile dir @@ -420,7 +414,7 @@ index a5c71e723907..f93e7f430996 100644 //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, -@@ -377,23 +370,6 @@ nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, +@@ -377,23 +367,6 @@ nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, return rv; }

1 0

[tor/master] Move windows header macros into orconfig.h
by nickm＠torproject.org 29 Jun '15

29 Jun '15

commit 66c73abe039611073d6086e617999d56ac8e73bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:47:55 2015 -0400 Move windows header macros into orconfig.h This should prevent duplicated code, and lower the likelihood of accidentally making them inconsistent. --- changes/win-macros | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/win-macros b/changes/win-macros new file mode 100644 index 0000000..a3519c3 --- /dev/null +++ b/changes/win-macros @@ -0,0 +1,7 @@ + o Code simplification and refactoring: + - Define WINVER and _WIN32_WINNT centrally, in orconfig.h, in order + to ensure they remain consistent and visible everywhere. + + - Remove vestigial workarounds for some ancient versions of the MSVC + compiler. +

1 0

[tor/master] Remove checks for visual C 6.
by nickm＠torproject.org 29 Jun '15

29 Jun '15

commit d9052c629b94343aef63f4e8c891c9c0a9c097b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:03 2015 -0400 Remove checks for visual C 6. --- changes/win-macros | 4 ++-- configure.ac | 13 ++++++------- src/common/address.c | 5 ++--- src/common/aes.c | 12 ++---------- src/common/compat.h | 25 +------------------------ src/common/crypto.c | 4 ---- src/common/torlog.h | 11 ----------- src/common/tortls.c | 12 ++---------- src/or/or.h | 7 ------- src/test/test_address.c | 4 ++-- src/tools/tor-resolve.c | 4 ---- 11 files changed, 17 insertions(+), 84 deletions(-) diff --git a/changes/win-macros b/changes/win-macros index a3519c3..a46a474 100644 --- a/changes/win-macros +++ b/changes/win-macros @@ -2,6 +2,6 @@ - Define WINVER and _WIN32_WINNT centrally, in orconfig.h, in order to ensure they remain consistent and visible everywhere. - - Remove vestigial workarounds for some ancient versions of the MSVC - compiler. + - Remove some vestigial workarounds for the MSVC6 compiler. We haven't + supported that in ages. diff --git a/configure.ac b/configure.ac index 23d4c98..0f93e46 100644 --- a/configure.ac +++ b/configure.ac @@ -335,6 +335,12 @@ bwin32=true; AC_MSG_RESULT([yes]), bwin32=false; AC_MSG_RESULT([no])) fi +if test "$bwin32" = yes; then + AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, [Defined to avoid including some windows headers]) + AC_DEFINE(WINVER, 0x0501, [Defined to access windows functions and definitions for >=WinXP]) + AC_DEFINE(_WIN32_WINNT, 0x0501, [Defined to access windows functions and definitions for >=WinXP]) +fi + AM_CONDITIONAL(BUILD_NT_SERVICES, test x$bwin32 = xtrue) dnl Enable C99 when compiling with MIPSpro @@ -1122,13 +1128,9 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , , #ifdef _WIN32 #define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#include <winsock.h> -#else #include <winsock2.h> #include <ws2tcpip.h> #endif -#endif ]) AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct sockaddr_in.sin_len, struct sockaddr_in6.sin6_len], , , [#ifdef HAVE_SYS_TYPES_H @@ -1146,9 +1148,6 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #ifdef _WIN32 #define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#include <winsock.h> -#else #include <winsock2.h> #include <ws2tcpip.h> #endif diff --git a/src/common/address.c b/src/common/address.c index 6bd1078..d7d815e 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -10,17 +10,16 @@ #define ADDRESS_PRIVATE +#include "orconfig.h" + #ifdef _WIN32 /* For access to structs needed by GetAdaptersAddresses */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 #include <process.h> #include <winsock2.h> #include <windows.h> #include <iphlpapi.h> #endif -#include "orconfig.h" #include "compat.h" #include "util.h" #include "address.h" diff --git a/src/common/aes.c b/src/common/aes.c index 8b9d81f..5f2c3f2 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -12,16 +12,8 @@ #include "orconfig.h" #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ - #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x0501 - #endif - #define WIN32_LEAN_AND_MEAN - #if defined(_MSC_VER) && (_MSC_VER < 1300) - #include <winsock.h> - #else - #include <winsock2.h> - #include <ws2tcpip.h> - #endif + #include <winsock2.h> + #include <ws2tcpip.h> #endif #include <openssl/opensslv.h> diff --git a/src/common/compat.h b/src/common/compat.h index e1b860f..fbaeb6f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -10,17 +10,9 @@ #include "torint.h" #include "testsupport.h" #ifdef _WIN32 -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#endif -#define WIN32_LEAN_AND_MEAN -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#include <winsock.h> -#else #include <winsock2.h> #include <ws2tcpip.h> #endif -#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif @@ -90,13 +82,8 @@ /* Try to get a reasonable __func__ substitute in place. */ #if defined(_MSC_VER) -/* MSVC compilers before VC7 don't have __func__ at all; later ones call it - * __FUNCTION__. */ -#if _MSC_VER < 1300 -#define __func__ "???" -#else + #define __func__ __FUNCTION__ -#endif #else /* For platforms where autoconf works, make sure __func__ is defined @@ -112,18 +99,8 @@ #endif /* ifndef MAVE_MACRO__func__ */ #endif /* if not windows */ -#if defined(_MSC_VER) && (_MSC_VER < 1300) -/* MSVC versions before 7 apparently don't believe that you can cast uint64_t - * to double and really mean it. */ -extern INLINE double U64_TO_DBL(uint64_t x) { - int64_t i = (int64_t) x; - return (i < 0) ? ((double) INT64_MAX) : (double) i; -} -#define DBL_TO_U64(x) ((uint64_t)(int64_t) (x)) -#else #define U64_TO_DBL(x) ((double) (x)) #define DBL_TO_U64(x) ((uint64_t) (x)) -#endif #ifdef ENUM_VALS_ARE_SIGNED #define ENUM_BF(t) unsigned diff --git a/src/common/crypto.c b/src/common/crypto.c index afaf93a..984fe95 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -13,10 +13,6 @@ #include "orconfig.h" #ifdef _WIN32 -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#endif -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <wincrypt.h> /* Windows defines this; so does OpenSSL 0.9.8h and later. We don't actually diff --git a/src/common/torlog.h b/src/common/torlog.h index 8923a9e..710313a 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -210,16 +210,6 @@ void log_notice_(log_domain_mask_t domain, const char *format, ...); void log_warn_(log_domain_mask_t domain, const char *format, ...); void log_err_(log_domain_mask_t domain, const char *format, ...); -#if defined(_MSC_VER) && _MSC_VER < 1300 -/* MSVC 6 and earlier don't have __func__, or even __LINE__. */ -#define log_fn log_fn_ -#define log_fn_ratelim log_fn_ratelim_ -#define log_debug log_debug_ -#define log_info log_info_ -#define log_notice log_notice_ -#define log_warn log_warn_ -#define log_err log_err_ -#else /* We don't have GCC's varargs macros, so use a global variable to pass the * function name to log_fn */ extern const char *log_fn_function_name_; @@ -233,7 +223,6 @@ extern const char *log_fn_function_name_; #define log_notice (log_fn_function_name_=__func__),log_notice_ #define log_warn (log_fn_function_name_=__func__),log_warn_ #define log_err (log_fn_function_name_=__func__),log_err_ -#endif #endif /* !GNUC */ diff --git a/src/common/tortls.c b/src/common/tortls.c index bd0eaff..7447822 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -18,16 +18,8 @@ #include <assert.h> #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ - #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x0501 - #endif - #define WIN32_LEAN_AND_MEAN - #if defined(_MSC_VER) && (_MSC_VER < 1300) - #include <winsock.h> - #else - #include <winsock2.h> - #include <ws2tcpip.h> - #endif + #include <winsock2.h> + #include <ws2tcpip.h> #endif #ifdef __GNUC__ diff --git a/src/or/or.h b/src/or/or.h index d3a476e..0950277 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -22,13 +22,6 @@ #endif #endif -#ifdef _WIN32 -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#endif -#define WIN32_LEAN_AND_MEAN -#endif - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/test/test_address.c b/src/test/test_address.c index d13d678..9d64563 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -3,11 +3,11 @@ #define ADDRESS_PRIVATE +#include "orconfig.h" + #ifdef _WIN32 #include <winsock2.h> /* For access to structs needed by GetAdaptersAddresses */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 #include <iphlpapi.h> #endif diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 19e3a55..08bce15 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -33,13 +33,9 @@ #endif #ifdef _WIN32 -#if defined(_MSC_VER) && (_MSC_VER <= 1300) -#include <winsock.h> -#else #include <winsock2.h> #include <ws2tcpip.h> #endif -#endif #define RESPONSE_LEN_4 8 #define log_sock_error(act, _s) \

1 0