summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyungwook Tak <k.tak@samsung.com>2016-02-29 15:21:03 +0900
committerKyungwook Tak <k.tak@samsung.com>2016-02-29 15:21:03 +0900
commit85fcabc237b557e35974a64019f98bf4bf031dff (patch)
treef464acf19dd7e3ab296c264e8963b8da0eba5bfe
parent31f7b7c01d8d0444aec202ab0c705d76894242cc (diff)
downloadkey-manager-85fcabc237b557e35974a64019f98bf4bf031dff.tar.gz
key-manager-85fcabc237b557e35974a64019f98bf4bf031dff.tar.bz2
key-manager-85fcabc237b557e35974a64019f98bf4bf031dff.zip
Add BSD-2.0 license for sqlcipher
Refer SQL Cipher license info in https://www.zetetic.net/sqlcipher/license/ Change-Id: I54e9569cd529b65e4af8be857c7ac33dd822012b Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
-rw-r--r--LICENSE.BSD-2.024
-rw-r--r--packaging/key-manager.spec3
-rw-r--r--src/manager/sqlcipher/sqlcipher.c26
-rw-r--r--src/manager/sqlcipher/sqlcipher.h26
4 files changed, 78 insertions, 1 deletions
diff --git a/LICENSE.BSD-2.0 b/LICENSE.BSD-2.0
new file mode 100644
index 00000000..5658a940
--- /dev/null
+++ b/LICENSE.BSD-2.0
@@ -0,0 +1,24 @@
+Copyright (c) 2008-2012 Zetetic LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the ZETETIC LLC nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY ZETETIC LLC ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL ZETETIC LLC BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 12bce6a0..f93fcec7 100644
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -3,7 +3,7 @@ Summary: Central Key Manager and utilities
Version: 0.1.20
Release: 1
Group: System/Security
-License: Apache-2.0 and BSL-1.0
+License: Apache-2.0 and BSL-1.0 and BSD-2.0
Source0: %{name}-%{version}.tar.gz
Source1001: key-manager-pam-plugin.manifest
Source1002: libkey-manager-client.manifest
@@ -229,6 +229,7 @@ fi
%manifest key-manager.manifest
%license LICENSE
%license LICENSE.BSL-1.0
+%license LICENSE.BSD-2.0
%{_bindir}/key-manager
%{_unitdir}/multi-user.target.wants/central-key-manager.service
%{_unitdir}/central-key-manager.service
diff --git a/src/manager/sqlcipher/sqlcipher.c b/src/manager/sqlcipher/sqlcipher.c
index 13ffc1c2..f9cf4e21 100644
--- a/src/manager/sqlcipher/sqlcipher.c
+++ b/src/manager/sqlcipher/sqlcipher.c
@@ -1,3 +1,29 @@
+/*
+ * Copyright (c) 2008-2012 Zetetic LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the ZETETIC LLC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ZETETIC LLC ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL ZETETIC LLC BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
** version 3.7.9. By combining all the individual C code files into this
diff --git a/src/manager/sqlcipher/sqlcipher.h b/src/manager/sqlcipher/sqlcipher.h
index d26dd36a..d13782d6 100644
--- a/src/manager/sqlcipher/sqlcipher.h
+++ b/src/manager/sqlcipher/sqlcipher.h
@@ -1,4 +1,30 @@
/*
+ * Copyright (c) 2008-2012 Zetetic LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the ZETETIC LLC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ZETETIC LLC ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL ZETETIC LLC BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
** 2001 September 15
**
** The author disclaims copyright to this source code. In place of