summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-02-13 02:03:43 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-02-13 04:57:50 (GMT)
commit666518719779ddf9e04d28aab00211f5cb472c5e (patch)
tree099f9e9f67bb1b861034c38a4b0d043a2af1370e
parent93b57ea9bade98fbb2f86f49c48632041339f094 (diff)
downloadtdk-o-amlogic.zip
tdk-o-amlogic.tar.gz
tdk-o-amlogic.tar.bz2
tdk: change gpl license to amlogic license [2/4]
PD# 160531 change gpl license to amlogic license Change-Id: I57bfab1e43dbfc0bbb9495d7667151d18e726e75
Diffstat
-rw-r--r--ta_export/host_include/__tee_ipsocket.h2
-rw-r--r--ta_export/host_include/tee_ta_api.h4
-rw-r--r--ta_export/include/__tee_ipsocket.h2
-rw-r--r--ta_export/include/tee_ta_api.h4
-rwxr-xr-xta_export/scripts/gen_aes_iv.py24
-rwxr-xr-xta_export/scripts/gen_aes_key.py24
-rwxr-xr-xta_export/scripts/gen_cert_key.py11
-rwxr-xr-xta_export/scripts/gen_rsa_prv_key.py11
-rwxr-xr-xta_export/scripts/gen_rsa_pub_key.py11
-rwxr-xr-xta_export/scripts/nosign.py24
-rwxr-xr-xta_export/scripts/pack_arbt.py11
-rwxr-xr-xta_export/scripts/pack_kpub.py10
-rwxr-xr-xta_export/scripts/sign_ta.py11
-rwxr-xr-xta_export/scripts/sign_ta_auto.py11
14 files changed, 35 insertions, 125 deletions
diff --git a/ta_export/host_include/__tee_ipsocket.h b/ta_export/host_include/__tee_ipsocket.h
index 7c33666..f2dd6fd 100644
--- a/ta_export/host_include/__tee_ipsocket.h
+++ b/ta_export/host_include/__tee_ipsocket.h
@@ -29,7 +29,7 @@
#define ____TEE_IPSOCKET_H
typedef enum TEE_ipSocket_ipVersion_e {
- TEE_IP_VERSION_DC = 0, /* don’t care */
+ TEE_IP_VERSION_DC = 0,
TEE_IP_VERSION_4 = 1,
TEE_IP_VERSION_6 = 2
} TEE_ipSocket_ipVersion;
diff --git a/ta_export/host_include/tee_ta_api.h b/ta_export/host_include/tee_ta_api.h
index fd4a21b..888ecbc 100644
--- a/ta_export/host_include/tee_ta_api.h
+++ b/ta_export/host_include/tee_ta_api.h
@@ -39,7 +39,7 @@
* TA Interface
*
* Each Trusted Application must provide the Implementation with a number
- * of functions, collectively called the “TA interface”. These functions
+ * of functions, collectively called the These functions
* are the entry points called by the Trusted Core Framework to create the
* instance, notify the instance that a new client is connecting, notify
* the instance when the client invokes a command, etc.
@@ -69,7 +69,7 @@
TEE_Result TA_EXPORT TA_CreateEntryPoint(void);
/*
- * The function TA_DestroyEntryPoint is the Trusted Application‟s
+ * The function TA_DestroyEntryPoint is the Trusted Application
* destructor, which the Framework calls when the instance is being
* destroyed.
*
diff --git a/ta_export/include/__tee_ipsocket.h b/ta_export/include/__tee_ipsocket.h
index 7c33666..f2dd6fd 100644
--- a/ta_export/include/__tee_ipsocket.h
+++ b/ta_export/include/__tee_ipsocket.h
@@ -29,7 +29,7 @@
#define ____TEE_IPSOCKET_H
typedef enum TEE_ipSocket_ipVersion_e {
- TEE_IP_VERSION_DC = 0, /* don’t care */
+ TEE_IP_VERSION_DC = 0,
TEE_IP_VERSION_4 = 1,
TEE_IP_VERSION_6 = 2
} TEE_ipSocket_ipVersion;
diff --git a/ta_export/include/tee_ta_api.h b/ta_export/include/tee_ta_api.h
index fd4a21b..888ecbc 100644
--- a/ta_export/include/tee_ta_api.h
+++ b/ta_export/include/tee_ta_api.h
@@ -39,7 +39,7 @@
* TA Interface
*
* Each Trusted Application must provide the Implementation with a number
- * of functions, collectively called the “TA interface”. These functions
+ * of functions, collectively called the These functions
* are the entry points called by the Trusted Core Framework to create the
* instance, notify the instance that a new client is connecting, notify
* the instance when the client invokes a command, etc.
@@ -69,7 +69,7 @@
TEE_Result TA_EXPORT TA_CreateEntryPoint(void);
/*
- * The function TA_DestroyEntryPoint is the Trusted Application‟s
+ * The function TA_DestroyEntryPoint is the Trusted Application
* destructor, which the Framework calls when the instance is being
* destroyed.
*
diff --git a/ta_export/scripts/gen_aes_iv.py b/ta_export/scripts/gen_aes_iv.py
index fb00a4e..3969f3d 100755
--- a/ta_export/scripts/gen_aes_iv.py
+++ b/ta_export/scripts/gen_aes_iv.py
@@ -1,29 +1,11 @@
#!/usr/bin/env python
#
-# Copyright (c) 2015, Linaro Limited
-# All rights reserved.
+# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
#
-# 2. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
#
def get_args():
diff --git a/ta_export/scripts/gen_aes_key.py b/ta_export/scripts/gen_aes_key.py
index 0159dd0..4b1a9e3 100755
--- a/ta_export/scripts/gen_aes_key.py
+++ b/ta_export/scripts/gen_aes_key.py
@@ -1,29 +1,11 @@
#!/usr/bin/env python
#
-# Copyright (c) 2015, Linaro Limited
-# All rights reserved.
+# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
#
-# 2. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
#
def get_args():
diff --git a/ta_export/scripts/gen_cert_key.py b/ta_export/scripts/gen_cert_key.py
index 8035f8c..70a9b15 100755
--- a/ta_export/scripts/gen_cert_key.py
+++ b/ta_export/scripts/gen_cert_key.py
@@ -2,15 +2,10 @@
#
# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
+#
#
def get_args():
diff --git a/ta_export/scripts/gen_rsa_prv_key.py b/ta_export/scripts/gen_rsa_prv_key.py
index 34147bb..50d1f7b 100755
--- a/ta_export/scripts/gen_rsa_prv_key.py
+++ b/ta_export/scripts/gen_rsa_prv_key.py
@@ -2,15 +2,10 @@
#
# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
+#
#
def get_args():
diff --git a/ta_export/scripts/gen_rsa_pub_key.py b/ta_export/scripts/gen_rsa_pub_key.py
index 22e427b..67ae35b 100755
--- a/ta_export/scripts/gen_rsa_pub_key.py
+++ b/ta_export/scripts/gen_rsa_pub_key.py
@@ -2,15 +2,10 @@
#
# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
+#
#
def get_args():
diff --git a/ta_export/scripts/nosign.py b/ta_export/scripts/nosign.py
index f904e02..3bcf045 100755
--- a/ta_export/scripts/nosign.py
+++ b/ta_export/scripts/nosign.py
@@ -1,29 +1,11 @@
#!/usr/bin/python
#
-# Copyright (c) 2015, Linaro Limited
-# All rights reserved.
+# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
#
-# 2. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
#
def get_args():
diff --git a/ta_export/scripts/pack_arbt.py b/ta_export/scripts/pack_arbt.py
index da1de06..b8d773a 100755
--- a/ta_export/scripts/pack_arbt.py
+++ b/ta_export/scripts/pack_arbt.py
@@ -2,15 +2,10 @@
#
# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
+#
#
def get_args():
diff --git a/ta_export/scripts/pack_kpub.py b/ta_export/scripts/pack_kpub.py
index fd0a0ab..9286b05 100755
--- a/ta_export/scripts/pack_kpub.py
+++ b/ta_export/scripts/pack_kpub.py
@@ -2,15 +2,9 @@
#
# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
#
def get_args():
diff --git a/ta_export/scripts/sign_ta.py b/ta_export/scripts/sign_ta.py
index 349affe..a113e80 100755
--- a/ta_export/scripts/sign_ta.py
+++ b/ta_export/scripts/sign_ta.py
@@ -2,15 +2,10 @@
#
# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
+#
#
def get_args():
diff --git a/ta_export/scripts/sign_ta_auto.py b/ta_export/scripts/sign_ta_auto.py
index bccbea3..70b9648 100755
--- a/ta_export/scripts/sign_ta_auto.py
+++ b/ta_export/scripts/sign_ta_auto.py
@@ -2,15 +2,10 @@
#
# Copyright (C) 2016 Amlogic, Inc. All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
+#
#
def get_args():