aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-06-17 10:19:40 -0400
committerNick Mathewson <nickm@torproject.org>2015-06-17 10:19:40 -0400
commit8d44ce910ddb00d6a9c18b912f2b027f822e5dc1 (patch)
tree901c4fac45c472d527ffeda5c91abac714fe39d3 /LICENSE
parentd68133c745ccecf2baf86fad08bfd40070c7368c (diff)
downloadtor-8d44ce910ddb00d6a9c18b912f2b027f822e5dc1.tar.gz
tor-8d44ce910ddb00d6a9c18b912f2b027f822e5dc1.zip
Add readpassphrase.c in src/ext
This is taken verbatim from openssh 6.8p1, which appears to have lightly tweaked it from the openbsd version.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE19
1 files changed, 19 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 48602c13c6..68c9b23374 100644
--- a/LICENSE
+++ b/LICENSE
@@ -249,7 +249,26 @@ As a special exception to the GNU General Public License, if you
distribute this file as part of a program that contains a
configuration script generated by Autoconf, you may include it under
the same distribution terms that you use for the rest of that program.
+===============================================================================
+src/ext/readpassphrase.[ch] are distributed under this license:
+
+ Copyright (c) 2000-2002, 2007 Todd C. Miller <Todd.Miller@courtesan.com>
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ Sponsored in part by the Defense Advanced Research Projects
+ Agency (DARPA) and Air Force Research Laboratory, Air Force
+ Materiel Command, USAF, under agreement number F39502-99-1-0512.
===============================================================================
If you got Tor as a static binary with OpenSSL included, then you should know: