January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Add placeholder file for lib/bridgedb/test package directory.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit a86f65f588a9eb9b7ab497c85cf93f05b116491e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 11:30:27 2013 +0000 Add placeholder file for lib/bridgedb/test package directory. --- 0 files changed diff --git a/lib/bridgedb/test/README b/lib/bridgedb/test/README new file mode 100644 index 0000000..e69de29

1 0

[bridgedb/master] Add BridgeDB's real GPG public keys.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 8ff12eb1f159f1acc46b26d80e70ec3837cb5097 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 11:11:48 2013 +0000 Add BridgeDB's real GPG public keys. * ADD 16384-bit public half of offline certification-only key. * ADD 4096-bit public halves of online signing+encryption keys. * ADD gnupghome/gpg.conf file with settings (both for the fake testing key and the real keys). * ADD gnupghome/* to the .gitignore. --- .gitignore | 3 + gnupghome/bridgedb-offline-key.pub.asc | 113 +++++++++++++++++++ gnupghome/bridgedb-online-signing-key.pub.asc | 148 +++++++++++++++++++++++++ gnupghome/gpg.conf | 96 ++++++++++++++++ 4 files changed, 360 insertions(+) diff --git a/.gitignore b/.gitignore index 47ea554..d560f20 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,6 @@ run/* # do not recommit lib/bridgedb/_langs.py: # (the "supported" variable is supposed to be rewritten at install time) lib/bridgedb/_langs.py + +# ignore any changes to our GnuPG directory: +gnupghome/* \ No newline at end of file diff --git a/gnupghome/bridgedb-offline-key.pub.asc b/gnupghome/bridgedb-offline-key.pub.asc new file mode 100644 index 0000000..47d1310 --- /dev/null +++ b/gnupghome/bridgedb-offline-key.pub.asc @@ -0,0 +1,113 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +ILUXBkpIDfVSoZD7qWlntai53BDQr5pfMJhv15di4XAhtqv43vAmA57ifd+QJS2U +AfYc4CdX0lk2BZ4jRD8jCZ4Uxw15E3RqhnXsWDRxtD4fwsb2ZFi0DDuPlwBdGgh5 +Rm2Bz9JjSV6gDEuXr/JtAzjSz1Jdh8wPkSofiHGTfxysVhlGlg+YPRziRlzML8A2 +0xY+9mPxEEin5ZQ9wmrDyiiOBvPTbG3O9+Sp5VZDuD4ivW/DHumPWGVSRdjcAQDe +HMXUVGjhBDnj06XNrgJPhODdJeYq0EnGTt15ofZQSswD7TTTRPDOn0Cz/QARAQAB +tDpCcmlkZ2VEQiAoT2ZmbGluZSBJRCBLZXkpIDxicmlkZ2VzQGJyaWRnZXMudG9y +cHJvamVjdC5vcmc+iQkfBBMBCgEJBQJSWQfkSBSAAAAAABcAKHZlcmlmaWVkQHRv +cnByb2plY3Qub3JnN0I3ODQzNzAxNUU2M0RGNDdCQjEyNzBBQ0JEOTdBQTI0RThF +NDcyRU8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmc3Qjc4 +NDM3MDE1RTYzREY0N0JCMTI3MEFDQkQ5N0FBMjRFOEU0NzJFKhpodHRwczovL2Jy +aWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAIbAQMLDQkEFQoJCAQWAgEA +Ah4BAheAJxhodHRwczovL2JyaWRnZXMudG9ycHJvamVjdC5vcmcva2V5LmFzYwAK +CRDL2XqiTo5HLoqEP/48rFpJCVStn8xo+KkHSVvsqpxDRlb/nNheI+ov2UxILdwl +NIU6kLsvKECKPe1AHKdS/MzANbkTF35Y4QgZsNpVXaCVL7adGBSzOdPFupDJJVOu +wa+uFRc/FuNJyH/TIn56/+R5J5C54OxIYNxvW3WF4eHKLJYk/JZOMMfy4iWm7Sql +0nDC5O435nK4F4Jb4GLPlUIzioIy2OWqGoFHXymbGhL1tWaqasYmED4n3AMqlYw6 +xnNhdWOc/KZelPl9nanybyh0IIdZqUKZleRt4BxSgIT8FqC2sZuZ8z7O9s987Naz +Q32SKaP4i2M9lai/Y2QYfKo+wlG+egmxtujz7etQMGlpgBZzFLdJ8/w4U11ku1ai +om74RIn8zl/LHjMQHnCKGoVlscTI1ZPt+p+p8hO2/9vOwTR8y8O/3DQSOfTSipwc +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 +YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0 +QjVFRUI2OERDNDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2pl +Y3Qub3JnL3BvbGljeS50eHQACgkQjcQ6KEiCHjIaqBAA0BuEs7horx6iCq4cjAhv +YPLrxuC4fKEfVyhAjCJMJSFFCPAlGgU+BjyPNDD57wzKAmUkdJG+Ss25mwWXa53w +5R2kDqDnHocOdZGtxZ7zx/uUd2eWLNBfVuK7nHOk1d1Hs0OZBnckc+MCqnLtuYe5 +68pa9+jW6cNIjAnzMIListmoXWgYYWJvMKeBMG4DGtYJ8w7CJQjOHc5yar12DrX3 +wnQ7hXtFuuqQblpEUnLnZGvHf2NKMZfBBMcP96h9OmLGNa+vmNYsMyPKU7n5hPgX +nTgmQ4xrv1G7JukjppZRA8SFoxupcaQeTixyWERGBhBiAbwZsbQz8L/TVZKierzg +sdNngHcFzE8MyjuJDvTos7qXPmgSRXFqJLRn0ZxpR5V1V8BVZUqCGuSZT89TizsD +z5vyv8c9r7HKD4pRjw32P2dgcEqyGRkqERAgSuFpObP+juty+kxYyfnadBNCyjgP +s7u0GmsTt4CZi7BbowNRL6bynrwrmQI9LJI1bPhgqfdDUbqG3HXwHz80oRFfKou8 +JTYKxK4Iumfw2l/uAACma5ZyrwIDBX/H5XEQqch4sORzQnuhlTmZRf6ldVIIWjdJ +ef+DpOt12s+cS2F4D5g8G6t9CprCLYyrXiHwM/U8N5ywL9IeYKSWJxa7si3l9A6o +ZxOds8F/UJYDSIB97MQFzBo= +=JdC7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gnupghome/bridgedb-online-signing-key.pub.asc b/gnupghome/bridgedb-online-signing-key.pub.asc new file mode 100644 index 0000000..4f10dcf --- /dev/null +++ b/gnupghome/bridgedb-online-signing-key.pub.asc @@ -0,0 +1,148 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFIv8YABEADRqvfLB4xWj3Fz+HEmUUt/qbJnZhqIjo5WBHaBJOmrzx1c9fLN +aYG36Hgo6A7NygI1oQmFnDinSrZAtrPaT63d1Jg49yZwr/OhMaxHYJElMFHGJ876 +kLZHmQTysquYKDHhv+fH51t7UVaZ9NkP5cI+V3pqck0DW5DwMsVJXNaU317kk9me +mPJUDMb5FM4d2Vtk1N+54bHJgpgmnukNtpJmRyHRbZBqNMln5nWF7vdZ4u5PGPWj +bA0rPZhayeE3FQ0MHiGL12kHAy30pfg54QfPJDQBCywjABetRE+xaM9TcS+R31Pf +2VbLeb+Km7QpHMwOXI5xZLss9BAWm9EBbmXxuqaRBHyi830jjCrK9UYuzzOqKoUV +Mk1BRelZTFnGPWeVTE+Ps+pwJ0Dwx4ghppJBCoArmEbkNliblxR/2wYOOFi/ZVA4 +Zc2ok9T3rBLVg07b7ezFUScGiTnc7ac7hp6r8Qsh09ZbhRr9erK/n194aEvkXTfr +qepwrAE7YeF4YuR206UOFFWDhxWDLbRu0gIWgrevEQu/cvQPrO9uH5fL6Gw/+mNP +Q/NIteejhkDyvyTUKyBu7x+Gls71zT2u/X13eOAJ8IxBkSVRKQ8tRD+oqJkWplOf ++BpaGU+g6u4kT2AzFDxTOupfrYcPvORTAV/V3suys2YQE4x422GASXDivQARAQAB +tClCcmlkZ2VEQiA8YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnPokDJQQT +AQoBDwUCUi/xgEgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODEx +MTA5RTE3QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJp +ZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVF +RUI2OERDNDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qu +b3JnL3BvbGljeS50eHQCGwEFCQHhM4ADCw0JBBUKCQgEFgIBAAIeAQIXgCcYaHR0 +cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL2tleS5hc2MACgkQjcQ6KEiCHjIW +qw//WM8jAeuZaNl+2Cdt8Mbe4TCS4jggy4IfRgVqOiKEdIcMXUrDIUXsfg1tc+Jg +Gk6Ztcw4Mt8HYIEn2MyhuSWOlRoPlLNzN8i8bVBsPHUGKoX0Z1xIahBhkcXVJTJe +cxRHhvXOpUe+vd54fGYBz/7ViXwwZOjCA7e1zsdkhkpjAkWdJgPynH93bXMU8PYA +XlMR4rJDTs2LCvMIw3BKfv3Z5zE1a3vQFE1dKsKj6Q3fBYw0gZuobF5Z7fgbN9L+ +f9H9bz0A9K7z6AH+6/C9kHwsjWa2zI7Ei+jexQX+v9udNeR1GphLorgewe+1X+9z +UsWhBnczSQU/lQFiFuMFgbzFsuwqD8lmDPrO7Ek3b2R0Klv8ge0cA2Y6z7cVZ8Px +BIEJ5Z9FEqhNBsaLvbbCGbeXUnvzue3Gqcv2WJ8aNfDnPV7BBrtgRSTMP+ErEqyq +DTPWdOASZmEgqox62zMFP42U7UrgHrGKO801Z6P50ELYAganCOEDFC8YM/R1l+Sq +ZezRjjNYj0qNUEm2bBNzLDhi7VvMpoxr2D5oIIrm2i+WeankO2hQuPGuRc0rvASb +tOazhVWqRSddVxeFGlIye8J93NLgEzlHaU1yBwsq/y09/uvmpW65+424HaYzdWVq +s3H4GCa7VyxH6GoQJeXxqQbJP3gsNkSeEyuXF7LyuFl6hVSJCOYEEwEKANAFAlJZ +D9AFgwG4FTBIFIAAAAAAFwAodmVyaWZpZWRAdG9ycHJvamVjdC5vcmdERjgxMTEw +OUUxN0M4QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyTxSAAAAAAB4AKGJyaWRn +ZXNAYnJpZGdlcy50b3Jwcm9qZWN0Lm9yZzdCNzg0MzcwMTVFNjNERjQ3QkIxMjcw +QUNCRDk3QUEyNEU4RTQ3MkUqGmh0dHBzOi8vYnJpZGdlcy50b3Jwcm9qZWN0Lm9y +Zy9wb2xpY3kudHh0AAoJEMvZeqJOjkcuVyY//3Gqkvf84Mo3cLcpux1L6F1UqyQ7 +ZwgFAVbrtsR/8HbDD0BUIEoKUbqkqdMhhNeE+yNzlZHLMqgUxveb4sgfYNStMTJ/ +VSlNPTf/T25FShmS6BghWF8qubyKi4cpqyt3zD1INvvTWdRVzRpwxYRBKKWdALl2 +7J5PqvDSvevjx6h6Gc4FoO97WbK5qaQFOc2Nnw2CKCiEiyL3RciMR4IkvAPoxv+E +Wi6uhCD72s4apqkPiSnsdDqWI/MMkxP7ZKwyyAy/8qMsI79DqwEr2dmLs6AOIXgb +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 +klHqPZwzyHw0O+tBuQINBFIv8oEBEAC2f6e8USDR2OzDH9/26PyNFkcVh3dQBPbU +U6MhINUtrtWK1li+TPQ/LGkbKfXKZ6RhLoVt77uxuJ2rGNu6js+G0irtWDAFSAuf +L9bRJwanaNcxKzY4bN/D65iSm27PbQ32GDotsdBpYTGyKzUrXGaZwnS2ulOjSzG4 +IAy9RsYzD2ATIuE7S4HCHkQ1Eo7GbHGZICsbOUJElXN0q2Mq2msiHPFrSKQy3MT7 +ev4PdK22rWcwXzvvd0c+6lFx5oM7jNIctRb5+tfaNyOQ7Fq3zs/bf0Ls56DgcOD3 +8wzzU+1Zc2TeMRwHK+fuwfgx/SLL5QreTZEBbmKRWQqVzWg9lzrZiKo0wnizX3IE +xI9KqFCBCsimwSIHz/u0trS18vCSlE8uYPZMV0Hh7ni8pEODLdfCR9JzB2x20JdC +tyxk+LnEQzpozbZUApbVS5CJNxopsqirP73WfXPnZuAJMdarCXML73l/opiXtnvU +VKHXMVl8Vq2J7j2uW+Z30dYvhn1dKJ/z7QEPIHPQpCaTIquU0AzhYRT+skHKu+7F +7lJBJeampqbXnc9vBNCOvd7pZ38HLBPNKcZKSBup99w2SUhMqoLVoxNT9qZ7FXzu +SC7N5ii3u2ztb96jF3ApDAhh/5MM77aMKmL2OIGmTA2bUBWPFO5SPRXUVL1XXhwA +duMtvdZ4cwARAQABiQWDBBgBCgDTBQJSL/KBSBSAAAAAABcAKHZlcmlmaWVkQHRv +cnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNBMjg0ODgy +MUUzMk8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmdERjgx +MTEwOUUxN0M4QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyKhpodHRwczovL2Jy +aWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAIbAgUJAeEzgAKkCRCNxDoo +SIIeMsHYIAQZAQoAgQUCUi/ygU8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9y +cHJvamVjdC5vcmc5RkUzOUQxQTc0Mzg5MjIzM0IzRjY2RjIyMUI1NTRFOTU5MzhG +NEQwKhpodHRwczovL2JyaWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAAK +CRAhtVTpWTj00Ns/D/kBN79Pz55pOgLe/RNg1Efme95C/MBZ2eyEPeWe9+yAOFuK +XCJ8qlzkscpdTeu9vjYcfZy7RyS6Sx0NO8gJkP1wmNGr8X4zObSk0IAmDSlCcdpp +YVCPD4IdgSiLNqLdL6JjGE0d5J0DpPLvGbj5sc1/QCpuVt3p0rCr0S+PAAjrNmwA +e2yYdFQx2sXAZ0pp7oJJyFRPYlAUE8RYyG/N2kMYAJZVpI+zFgq5iD0uCmzAZyh/ +62mtGMpGXwy1KHS5+NtUGVN5Iqkvlj59xNEPc8jzDs5yvfOOvpelgbhJQ0exbDHK +78NNeDvouTX/4F1ofbmEM4BqwtQ5TvJEvzMP9zszQWQZd2OvkjYMQSrDMn1w8daO +mBvw319kug8U/0k6YoYcg2rE17tN/CJN0Pq4Mqz+79ArVT6jeJgFcFNER2ik9R0F +Mz3BhFSHIZdMQouFQ/cwaldiWB5g+tJ2nvpXI3cHMtNsy/77uvHIrEv1xZhTSmdc +eA8LmfIdfmepeaEyeTEAPcGebyf1cN+CLJMMTGqSwSHZVe3KFV8t7PKUQ/Z/C13z ++YAEEKxOPNlboVF9FECNRlZkYWkWDyejXHklL26KzBE/mDWoeKM0VakbJO0laXlU +13R334u1VRfWNGkNSmyNlzGqzd+y/Dan4f/NDXAW8Ouyhq+Go5Or4ASclztkbznu +D/9mG59d6ZeeT+1u+dYeWNUjAYkIt3B/TMOs0KQjxHgvbogto1jy4MMvSfyygkCq +zDURZslBXw6gZbSHu1XZrfApaX0tphhOmiwztbwOr4aEDKv5MsT9MgkXEEh8BesF +g/3yUnZ34I8laKfWJQqxVI+reKz/aJYCx9gcoY2jJAaMQoSsxjtFU/KAPvkRhgq/ +QobO5BS/DPWn8SqMzLXlrG2UjR/E5mb6aQU5yDEtSrMuIHQk0hnc3OrgoNX8mt/B +uhVirtqmsJmrftcfvAfXFWp0RIzsh9qixYeE4yAUSX5mZ4a0zheq/jVAnL0KJEEn +p2Mw8pkBSmfJS0QpHtMxoaOkZSZO/Ofah751X2Hlr7KVG9ZUdqm8kKtDMJc/JCDz +tJSpzioUBcXcuG31sfUOayYtS3RG385SuxaC1IiY6QVQvVSh90UVtatfv/jiuWmb +ddgM7Eifto5ybTnPFNkQASRiFmz3NyrWbinmjnMfC94JJRJVwgOUree3KahjopLC +r6WiZEknm8SqaipkH7o7xKN7HIe0kvx67YqwTmCH1wK81pQQrbqZPh6xzCys+AXb +5VK8yoVX4duo7cQGYiODGaw0SqNqXFkzsJ0fy00LDfmKF7KVvtF2qSK50kgAe3Fc +tQRxUklWHHz5IEviG8nBETtXERQLhilK4E3BPc9BA+aPm7kCDQRSL/KeARAA0zi0 +eXuTSikT6Ywm+Af/GGJFofqK2+9BKICGeo+b/Hf3Yy8oY6mfQSJIeNf4WCjMJ7Gu +CpA5E2l9HjbtwRQdsxoGdRkne+duREsYqrLlyJQINqXse28rGhX7mtJ1MeuLZmkJ +tlwK3ZI/8CNKW4PonVspt1kEJmS8k0285fK6UxLU7fktpus9xHgIRB7jRR9eoRA1 +MsJXn9xKLV9547hYi6mjb581GA8YVLyndtitXrNYIIrKYD/nm9W5DAKcXnH9q6pk +lBHL7Lk1oqeKBmTwSxg0HjSh5AlFW4+ME8lgyEbbaN8IvuAhTxFc8PobY9XEH07L +T6lHRuzUjpi0IIHnaFHb+wCZuDCSYshGsZfiAH+gH8K65t3jkr9D4KFMTq1G/b4S +KC/IofILYqr0PamGkUH0AP8N2dErtmH6HH0EvFMPfahvqE4InhuhernfPoTGQGFW +Ram1Ps7czMgxOoeB35ZLelTSdB5NFaBd/E07O+6R11wWyw+ks0erWzbkfa/5W5gv +EH9gNWQE4UdIrhoTURbVD6NvBsWpMRnS2fZByMY5exDf4LJmE8LhIa/snzbS8LUh +9KI3qmw5oLn74IfkiEwrcjQwFLKY62WBLRdDR0aUqJtjRVRCzKjEcnVP53KYdaxm +YFaev81Y+sSJYSpqo+T9cv/QdHOE7tQsyaZCecMAEQEAAYkC6QQYAQoA0wUCUi/y +nkgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3QzhC +RjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJpZGdlc0Bicmlk +Z2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNB +Mjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL3BvbGlj +eS50eHQCGwwFCQHhM4AACgkQjcQ6KEiCHjIPZhAAs5l8T2mWL+kG8WbNyjdISe/W +D0zZ5E2vAnCq5DcxZ4rax3GblJWRxo1frRT5xoq21adGs8TC5NG1u/40KYn30aB2 +9YE6ida9yCR2R2EYKgX5sKGTXXOpnbFa9og4gXHrgU0f9vwT0rY7CyaRmjBfBxRX +fCy7i/+dnsuwhMHn0RHJL4yIEdmQk/HFA6Taep6ACl8Wfrebg0TX5zi63v1RbC4e +KBt39p+l46+UzGWGqP7yfLrHpYNMUIGJOgImvOWeHa2QWJWojHjCuXt5oIuER4ib +p0lUO2B56wljoAjYvgPHWLAVIAMaxQMriMalF4Nlmcgj0I4aWcFuKMXZVUuie/Ps +Epj8U2JpIWmGQhzUNN2eUF5WNV/8VPF/WqzcYBBlmGz1lMzRCmQ/Ws1DlJz2i5Pj +L2cOVatJrRH7Iwz4YPHxgtv+T777GfezuqaIq+ZDKlICxFjalg1gHe40hxsUDdH1 +oJrb5Tg6RD7QV//wDxHDi43p4iL57d3V8LLl/dICA03n/c4ilBBfoh0gWTCjw3pb +sgww4Q39lcUmcittWG5/xS1OLD9WVLSQ42rUu3c5hPL35zAOhFZsFJSIPuZ2ip8E +T94oJR/vE4KRRZca7Uy5A0TcPmB4qTMfaCmWjQOyCxPyJKc2ECx+thiHKglL62Ww +qgQ42nQM/debtU+2aTo= +=ieIZ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gnupghome/gpg.conf b/gnupghome/gpg.conf new file mode 100644 index 0000000..d4a9913 --- /dev/null +++ b/gnupghome/gpg.conf @@ -0,0 +1,96 @@ +## +## Options for GnuPG +## +## :author: isis <isis(a)patternsinthevoid.net> + +no-greeting +no-emit-version +charset utf-8 +display-charset utf-8 +utf8-strings +keyid-format long +default-key 8DC43A2848821E32 +trusted-key CBD97AA24E8E472E + +# When outputting certificates, view user IDs distinctly from keys: +fixed-list-mode + +verify-options no-show-photos show-uid-validity show-notations show-user-notations show-policy-urls show-keyserver-urls no-pka-lookups no-pka-trust-increase + +list-options no-show-photos show-uid-validity no-show-unusable-uids show-unusable-subkeys show-notations show-user-notations show-policy-urls show-keyserver-urls show-sig-expire show-sig-subpackets + +export-options no-export-attributes + +# Because some mailers change lines starting with "From " to ">From " +# it is good to handle such lines in a special way when creating +# cleartext signatures; all other PGP versions do it this way too. +#no-escape-from-lines + +## Indymedia Keyservers: +##---------------------- +keyserver hkps://2eghzlv2wwcq7u7y.onion +keyserver hkp://2eghzlv2wwcq7u7y.onion +keyserver hkps://keys.indymedia.org +keyserver hkp://keys.indymedia.org +keyserver https://keys.indymedia.org +keyserver http://keys.indymedia.org +keyserver https://qtt2yl5jocgrk7nu.onion +keyserver http://qtt2yl5jocgrk7nu.onion +keyserver-options ca-cert-file=~/scripts/certs/keys.indymedia.org + +## Normal keyservers: +##-------------------- +keyserver hkp://subkeys.pgp.net +keyserver mailto:pgp-public-keys@keys.pgp.net +keyserver pgp.mit.edu + +keyserver-options verbose verbose verbose no-include-revoked no-include-disabled no-auto-key-retrieve no-honor-keyserver-url no-honor-pka-record include-subkeys no-include-attributes + +#keyserver-options http-proxy=socks://127.0.0.1:59050 + +expert +allow-freeform-uid +cert-digest-algo SHA512 +digest-algo SHA512 +default-preference-list SHA512 SHA384 SHA256 CAMELLIA256 AES256 ZLIB ZIP Uncompressed +personal-cipher-preferences CAMELLIA256 AES256 +personal-digest-preferences SHA512 SHA384 SHA256 +personal-compress-preferences ZLIB ZIP +compress-level 9 +default-cert-expire 2y +ask-cert-expire +ask-cert-level +default-sig-expire 1y +no-ask-sig-expire + +## algorithm to protect the key in memory: +s2k-cipher-algo AES256 + +## use this one to mangle the passphrases: +s2k-digest-algo SHA512 + +## passphrase mangling mode: +## 0=plaintest +## 1=salt +## 3=salt+iteration +s2k-mode 3 + +## how mangly should we mangle it? 1024 < mangle < 65011712 +## +## try "python -c'import random;a=random.randint(32505856, 65011712);print a' +s2k-count 48454407 + +## Don't run if we can't secure mempages +require-secmem + +## Check the back sig on subkey which has made a signature +require-cross-certification + +## The notation on certifications we make: +## see http://thread.gmane.org/gmane.mail.notmuch.general/3721/focus=7234 +sig-notation bridges(a)bridges.torproject.org=%g +cert-notation bridges(a)bridges.torproject.org=%g +cert-notation verified(a)torproject.org=%f +set-policy-url https://bridges.torproject.org/policy.txt +sig-keyserver-url !https://bridges.torproject.org/key.asc +default-keyserver-url https://bridges.torproject.org/key.asc

1 0

[bridgedb/master] Add expired GPG secret subkeys, marked "TESTING (INSECURE!)".
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 70c1f8b711bff422cda70968f281e10a154e11c7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 11:06:56 2013 +0000 Add expired GPG secret subkeys, marked "TESTING (INSECURE!)". * ADD GPG keys for testing purposes. They are expired, passwordless, marked with the UID "TESTING (INSECURE!) <bridges(a)bridges.torproject.org>". The (INSECURE!) part tells GnuPG to not waste real entropy when using this key. --- gnupghome/TESTING.subkeys.sec | Bin 0 -> 6505 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnupghome/TESTING.subkeys.sec b/gnupghome/TESTING.subkeys.sec new file mode 100644 index 0000000..ae13a98 Binary files /dev/null and b/gnupghome/TESTING.subkeys.sec differ

1 0

[bridgedb/master] Fix a missing colon.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit e6f7b6cf00a6e0e61097056d18961a42ad5535a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 11:42:42 2013 +0000 Fix a missing colon. --- scripts/gen_bridge_descriptors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index c7ffcee..5bbc702 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -762,7 +762,7 @@ def create(count): if not os.path.isfile(cached): with open(cached, 'wb') as fh: fh.flush() - if os.path.isfile(cached) + if os.path.isfile(cached): os.rename(cached, "cached-extrainfo") for fn, giantstring in descriptor_files.items():

1 0

[bridgedb/master] Update fake bridge descriptor generation commands in .travis.yml.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 00d4c8960269a9eab0a4b23ad83c27fc441c9bee Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 11:47:55 2013 +0000 Update fake bridge descriptor generation commands in .travis.yml. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c94692a..e757005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,9 @@ script: - chmod u+x scripts/make-ssl-cert - chmod u+x scripts/executioner - cd run - - gen_bridge_descriptors 2000 - ../scripts/make-ssl-cert - ../scripts/executioner 60 bridgedb -r . -c bridgedb.conf + - bridgedb mock # add this when #9199's (or some other trial-based) tests are merged: - #- bridgedb test -n 2000 + #- bridgedb test - echo "Build successful."

1 0

[bridgedb/master] Remove old bridgedb.Opt module.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9463c6f49b00d7fcaab5fcd40fada114b0428792 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 11:34:23 2013 +0000 Remove old bridgedb.Opt module. --- lib/bridgedb/Opt.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lib/bridgedb/Opt.py b/lib/bridgedb/Opt.py deleted file mode 100644 index 3649213..0000000 --- a/lib/bridgedb/Opt.py +++ /dev/null @@ -1,17 +0,0 @@ -# Parse command line args - -import optparse - -def parseOpts(): - cmdParser = optparse.OptionParser() - cmdParser.add_option("-c", "--config", dest="configfile", - default="./bridgedb.conf", - help="set config file to FILE", metavar="FILE") - cmdParser.add_option("-d", "--dump-bridges", dest="dumpbridges", - action="store_true", default=False, - help="dump reserved bridges into files") - cmdParser.add_option("-t", "--testing", dest="testing", - action="store_true", default=False, - help="do some sanity tests") - - return cmdParser.parse_args()

1 0

[bridgedb/master] Use $CWD as the RUN_IN_DIR if unspecified, and update .travis.yml.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit a0cf2bdcf38c4b2a6fd8033fee4fcbf788497460 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 11:53:16 2013 +0000 Use $CWD as the RUN_IN_DIR if unspecified, and update .travis.yml. --- .travis.yml | 7 ++----- lib/bridgedb/opt.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e757005..3da05f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,14 +35,11 @@ install: # command to run tests, e.g. python setup.py test script: - python setup.py test - - test -d run || mkdir run - - cp bridgedb.conf run/ - chmod u+x scripts/make-ssl-cert - chmod u+x scripts/executioner - - cd run - - ../scripts/make-ssl-cert - - ../scripts/executioner 60 bridgedb -r . -c bridgedb.conf - bridgedb mock + - ./scripts/make-ssl-cert + - ./scripts/executioner 180 bridgedb -c bridgedb.conf # add this when #9199's (or some other trial-based) tests are merged: #- bridgedb test - echo "Build successful." diff --git a/lib/bridgedb/opt.py b/lib/bridgedb/opt.py index d3532b6..e7ec7c3 100644 --- a/lib/bridgedb/opt.py +++ b/lib/bridgedb/opt.py @@ -56,7 +56,7 @@ class BaseOptions(usage.Options): def opt_rundir(self, rundir): """Change to this directory""" if not rundir: - rundir = os.path.join(os.getcwdu(), 'run') + rundir = os.getcwdu() else: try: rundir = os.path.abspath(os.path.expanduser(rundir)) @@ -71,7 +71,7 @@ class BaseOptions(usage.Options): this base options parser are inherited by all child classes. """ usage.Options.__init__(self) - self['rundir'] = os.path.join(os.getcwdu(), 'run') + self['rundir'] = os.getcwdu() self['version'] = self.opt_version self['verbosity'] = 30

1 0

[bridgedb/master] Move getKey() to crypto module.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 808ff48c972e829d48232d393143acf41de9707d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 12:48:54 2013 +0000 Move getKey() to crypto module. --- lib/bridgedb/Main.py | 33 ++---------------------------- lib/bridgedb/crypto.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 2b8e4f8..5701681 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -18,6 +18,7 @@ from twisted.internet import reactor from bridgedb.parse import options +import bridgedb.crypto import bridgedb.Bridges as Bridges import bridgedb.Dist as Dist import bridgedb.Time as Time @@ -148,36 +149,6 @@ def configureLogging(cfg): logging.warn("Safe Logging: Disabled") -def getKey(fname): - """Load the key stored in fname, or create a new 32-byte key and store - it in fname. - - >>> name = os.tmpnam() - >>> os.path.exists(name) - False - >>> k1 = getKey(name) - >>> os.path.exists(name) - True - >>> open(name).read() == k1 - True - >>> k2 = getKey(name) - >>> k1 == k2 - True - """ - try: - f = open(fname, 'rb') - except IOError: - k = os.urandom(32) - flags = os.O_WRONLY|os.O_TRUNC|os.O_CREAT|getattr(os, "O_BIN", 0) - fd = os.open(fname, flags, 0400) - os.write(fd, k) - os.close(fd) - else: - k = f.read() - f.close() - - return k - def load(cfg, splitter, clear=False): """Read all the bridge files from cfg, and pass them into a splitter object. @@ -329,7 +300,7 @@ def startup(cfg, options): from bridgedb import HTTPServer # Load the master key, or create a new one. - key = getKey(cfg.MASTER_KEY_FILE) + key = bridgedb.crypto.getKey(cfg.MASTER_KEY_FILE) # Initialize our DB file. db = bridgedb.Storage.Database(cfg.DB_FILE+".sqlite", diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py new file mode 100644 index 0000000..ea00733 --- /dev/null +++ b/lib/bridgedb/crypto.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information + + +from __future__ import absolute_import +from __future__ import unicode_literals + +import os + +import OpenSSL.rand + + +def getKey(filename): + """Load the key stored in ``filename``, or create a new key. + + If ``filename`` does not exist, create a new 32-byte key and store it in + ``filename``. + + >>> name = os.tmpnam() + >>> os.path.exists(name) + False + >>> k1 = getKey(name) + >>> os.path.exists(name) + True + >>> open(name).read() == k1 + True + >>> k2 = getKey(name) + >>> k1 == k2 + True + + :param string filename: The filename to store the secret key in. + :rtype: bytes + :returns: A byte string containing the secret key. + """ + try: + fh = open(filename, 'rb') + except IOError: + key = OpenSSL.rand.bytes(32) + flags = os.O_WRONLY | os.O_TRUNC | os.O_CREAT | getattr(os, "O_BIN", 0) + with os.open(filename, flags, 0400) as fd: + os.write(fd, key) + os.fsync(fd) + else: + key = fh.read() + fh.close() + return key

1 0

[bridgedb/master] Move options parser to bridgedb.parse package and update bridgedb.Main.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 6b91519c11c222174a8e1138f40a38dd9cab4629 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 12:01:04 2013 +0000 Move options parser to bridgedb.parse package and update bridgedb.Main. --- lib/bridgedb/Main.py | 2 +- lib/bridgedb/opt.py | 140 ----------------------------------------- lib/bridgedb/parse/options.py | 140 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 141 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index e12c268..2b8e4f8 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -16,7 +16,7 @@ import gettext from twisted.internet import reactor -from bridgedb import options +from bridgedb.parse import options import bridgedb.Bridges as Bridges import bridgedb.Dist as Dist diff --git a/lib/bridgedb/opt.py b/lib/bridgedb/opt.py deleted file mode 100644 index e7ec7c3..0000000 --- a/lib/bridgedb/opt.py +++ /dev/null @@ -1,140 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file -# :license: 3-clause BSD, see included LICENSE for information - -"""Classes for commandline options parsing. - -** Module Overview: ** - -""" - -from __future__ import print_function -from __future__ import unicode_literals - -import sys -import textwrap -import os - -from twisted.python import usage - -from bridgedb import __version__ - - -def parseOptions(): - """Create the main options parser and its subcommand parsers. - - Any :exc:`~twisted.python.usage.UsageErrors` which are raised due to - invalid options are ignored; their error message is printed and then we - exit the program. - - :rtype: :class:`MainOptions` - :returns: The main options parsing class, with any commandline arguments - already parsed. - """ - options = MainOptions() - try: - options.parseOptions() - except usage.UsageError as uerr: - print(uerr.message) - sys.exit(1) - return options - - -class BaseOptions(usage.Options): - """Base options included in all main and sub options menus.""" - - longdesc = textwrap.dedent("""BridgeDB is a proxy distribution system for - private relays acting as bridges into the Tor network. See `bridgedb - <command> --help` for addition help.""") - - def opt_rundir(self, rundir): - """Change to this directory""" - if not rundir: - rundir = os.getcwdu() - else: - try: - rundir = os.path.abspath(os.path.expanduser(rundir)) - except Exception as error: - raise usage.UsageError(error.message) - if rundir and os.path.isdir(rundir): - self['rundir'] = rundir - opt_r = opt_rundir - - def __init__(self): - """Create an options parser. All flags, parameters, and attributes of - this base options parser are inherited by all child classes. - """ - usage.Options.__init__(self) - self['rundir'] = os.getcwdu() - self['version'] = self.opt_version - self['verbosity'] = 30 - - def opt_quiet(self): - """Decrease verbosity""" - # We use '10' because then it corresponds to the log levels - self['verbosity'] -= 10 - - def opt_verbose(self): - """Increase verbosity""" - self['verbosity'] += 10 - - opt_q = opt_quiet - opt_v = opt_verbose - - def opt_version(self): - """Display BridgeDB's version and exit.""" - print("%s-%s" % (__package__, __version__)) - sys.exit() - - -class TestOptions(BaseOptions): - """Suboptions for running twisted.trial and unittest based tests.""" - - longdesc = textwrap.dedent("""BridgeDB testing commands. - See the `bridgedb mock` command for generating testing environments.""") - - optFlags = [['coverage', 'c', 'Generate coverage statistics']] - optParameters = [ - ['file', 'f', None, 'Run tests in specific file(s) (trial only)'], - ['unittests', 'u', False, 'Run unittests in bridgedb.Tests'], - ['trial', 't', True, 'Run twisted.trial tests in bridgedb.test']] - - completionData = usage.Completions( - mutuallyExclusive=[('unittests', 'coverage'), - ('unittests', 'file')], - optActions={'file': usage.CompleteFiles('lib/bridgedb/test/test_*.py', - repeat=True, - descr="test filename")}, - extraActions=[ - usage.Completer(descr="extra arguments to pass to trial")]) - - def parseArgs(self, *args): - """Parse any additional arguments after the options and flags.""" - self['test_args'] = args - -class MockOptions(BaseOptions): - """Suboptions for creating necessary conditions for testing purposes.""" - - optParameters = [ - ['descriptors', 'n', 1000, - '''Generate <n> mock bridge descriptor sets - (types: netstatus, extrainfo, server)''']] - - -class MainOptions(BaseOptions): - """Main commandline options parser for BridgeDB.""" - - optFlags = [ - ['dump-bridges', 'd', 'Dump bridges by hashring assignment into files'], - ['reload', 'R', 'Reload bridge descriptors into running servers']] - optParameters = [ - ['config', 'c', 'bridgedb.conf', 'Configuration file']] - subCommands = [ - ['test', None, TestOptions, "Run twisted.trial tests or unittests"], - ['mock', None, MockOptions, "Generate a testing environment"]] diff --git a/lib/bridgedb/parse/options.py b/lib/bridgedb/parse/options.py new file mode 100644 index 0000000..e7ec7c3 --- /dev/null +++ b/lib/bridgedb/parse/options.py @@ -0,0 +1,140 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information + +"""Classes for commandline options parsing. + +** Module Overview: ** + +""" + +from __future__ import print_function +from __future__ import unicode_literals + +import sys +import textwrap +import os + +from twisted.python import usage + +from bridgedb import __version__ + + +def parseOptions(): + """Create the main options parser and its subcommand parsers. + + Any :exc:`~twisted.python.usage.UsageErrors` which are raised due to + invalid options are ignored; their error message is printed and then we + exit the program. + + :rtype: :class:`MainOptions` + :returns: The main options parsing class, with any commandline arguments + already parsed. + """ + options = MainOptions() + try: + options.parseOptions() + except usage.UsageError as uerr: + print(uerr.message) + sys.exit(1) + return options + + +class BaseOptions(usage.Options): + """Base options included in all main and sub options menus.""" + + longdesc = textwrap.dedent("""BridgeDB is a proxy distribution system for + private relays acting as bridges into the Tor network. See `bridgedb + <command> --help` for addition help.""") + + def opt_rundir(self, rundir): + """Change to this directory""" + if not rundir: + rundir = os.getcwdu() + else: + try: + rundir = os.path.abspath(os.path.expanduser(rundir)) + except Exception as error: + raise usage.UsageError(error.message) + if rundir and os.path.isdir(rundir): + self['rundir'] = rundir + opt_r = opt_rundir + + def __init__(self): + """Create an options parser. All flags, parameters, and attributes of + this base options parser are inherited by all child classes. + """ + usage.Options.__init__(self) + self['rundir'] = os.getcwdu() + self['version'] = self.opt_version + self['verbosity'] = 30 + + def opt_quiet(self): + """Decrease verbosity""" + # We use '10' because then it corresponds to the log levels + self['verbosity'] -= 10 + + def opt_verbose(self): + """Increase verbosity""" + self['verbosity'] += 10 + + opt_q = opt_quiet + opt_v = opt_verbose + + def opt_version(self): + """Display BridgeDB's version and exit.""" + print("%s-%s" % (__package__, __version__)) + sys.exit() + + +class TestOptions(BaseOptions): + """Suboptions for running twisted.trial and unittest based tests.""" + + longdesc = textwrap.dedent("""BridgeDB testing commands. + See the `bridgedb mock` command for generating testing environments.""") + + optFlags = [['coverage', 'c', 'Generate coverage statistics']] + optParameters = [ + ['file', 'f', None, 'Run tests in specific file(s) (trial only)'], + ['unittests', 'u', False, 'Run unittests in bridgedb.Tests'], + ['trial', 't', True, 'Run twisted.trial tests in bridgedb.test']] + + completionData = usage.Completions( + mutuallyExclusive=[('unittests', 'coverage'), + ('unittests', 'file')], + optActions={'file': usage.CompleteFiles('lib/bridgedb/test/test_*.py', + repeat=True, + descr="test filename")}, + extraActions=[ + usage.Completer(descr="extra arguments to pass to trial")]) + + def parseArgs(self, *args): + """Parse any additional arguments after the options and flags.""" + self['test_args'] = args + +class MockOptions(BaseOptions): + """Suboptions for creating necessary conditions for testing purposes.""" + + optParameters = [ + ['descriptors', 'n', 1000, + '''Generate <n> mock bridge descriptor sets + (types: netstatus, extrainfo, server)''']] + + +class MainOptions(BaseOptions): + """Main commandline options parser for BridgeDB.""" + + optFlags = [ + ['dump-bridges', 'd', 'Dump bridges by hashring assignment into files'], + ['reload', 'R', 'Reload bridge descriptors into running servers']] + optParameters = [ + ['config', 'c', 'bridgedb.conf', 'Configuration file']] + subCommands = [ + ['test', None, TestOptions, "Run twisted.trial tests or unittests"], + ['mock', None, MockOptions, "Generate a testing environment"]]

1 0

[bridgedb/master] Use bridgedb.parse.options instead of bridgedb.opt in script.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 166a8c235b7921fe8c61e4d324f9dc22891bace0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 26 12:47:24 2013 +0000 Use bridgedb.parse.options instead of bridgedb.opt in script. --- scripts/bridgedb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/bridgedb b/scripts/bridgedb index 20c44b8..e121bd2 100644 --- a/scripts/bridgedb +++ b/scripts/bridgedb @@ -16,28 +16,28 @@ import os import sys from bridgedb import runner -from bridgedb import opt +from bridgedb.parse import options -options = opt.parseOptions() +option = options.parseOptions() -if options.subCommand is not None: +if option.subCommand is not None: # Hack to set the PYTHONPATH: sys.path[:] = map(os.path.abspath, sys.path) sys.path.insert(0, os.path.abspath(os.getcwd())) sys.path.insert(0, os.path.abspath(os.path.join(os.getcwd(), '../lib'))) - if 'descriptors' in options.subOptions: - runner.generateDescriptors(options) + if 'descriptors' in option.subOptions: + runner.generateDescriptors(option) - if options.subCommand == 'test': - if options.subOptions['trial']: - runner.runTrial(options.subOptions) - if options.subOptions['unittests']: - runner.runTests(options.subOptions) + if option.subCommand == 'test': + if option.subOptions['trial']: + runner.runTrial(option.subOptions) + if option.subOptions['unittests']: + runner.runTests(option.subOptions) sys.exit() # If no suboption was given, just run bridgedb: else: from bridgedb import Main - Main.run(options) + Main.run(option)

1 0