summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-04-28 17:48:25 +0200
committerArne Schwabe <arne@rfc2549.org>2014-04-28 17:48:25 +0200
commit318187206a3a247eaf00f77900728e1dae8e1fd8 (patch)
treec64c8e720d5740b5c11c755cf53fb46a78709d35
parent0c5af0c28f23f75f93e253aeccb00c5ad20c116e (diff)
update doc
--HG-- extra : rebase_source : 5851931ef2ac9dd4c9d817d95e9f704cad6111bc
-rw-r--r--doc/LICENSE.txt4
-rw-r--r--doc/README.txt2
-rw-r--r--doc/todo.txt2
-rw-r--r--remoteExample/LICENSE.remoteExample13
4 files changed, 18 insertions, 3 deletions
diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt
index 0cfdc19d..f023ce64 100644
--- a/doc/LICENSE.txt
+++ b/doc/LICENSE.txt
@@ -1,6 +1,8 @@
License for OpenVPN for Android. Please note that the thirdparty libraries/executables may have other license (OpenVPN, lzo, OpenSSL, Google Breakpad)
-Copyright (c) 2012-2013, Arne Schwabe
+The source code needed to control OpenVPN for Android from another app (the remoteExample) is licensed under the Apache v2 license.
+
+Copyright (c) 2012-2014, Arne Schwabe
All rights reserved.
If you need a non GPLv2 license of the source please contact me.
diff --git a/doc/README.txt b/doc/README.txt
index 2127689a..266f16b2 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -6,6 +6,8 @@ understand the licenses of the code. OpenVPN for Android is GPL licensed. You
_CANNOT_ build a closed sourced custom UI application without acquiring a different
(paid) license for UI code.
+The use of the AIDL API to control OpenVPN for Android is not subject to the license. The remoteExample project is licensed under the Apache 2.0 license.
+
When in doubt mail me about it.
See the file todo.txt for ideas/not yet implemented features (and the bug tracker).
diff --git a/doc/todo.txt b/doc/todo.txt
index 25b59a47..fa456e77 100644
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -19,8 +19,6 @@ Ideas:
- implement an encryption for profiles, so no sensitive data has be stored in plain text
- encrypt/decrypt with android private storage key (+no user input required)
- - hibernate when screen off and < 50 kB min
-
Missing configuration options:
diff --git a/remoteExample/LICENSE.remoteExample b/remoteExample/LICENSE.remoteExample
new file mode 100644
index 00000000..bf1c96ba
--- /dev/null
+++ b/remoteExample/LICENSE.remoteExample
@@ -0,0 +1,13 @@
+Copyright 2013-2014 Arne Schwabe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. \ No newline at end of file