summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorFlavio Santes <flavio.santes@intel.com>2016-08-06 22:41:49 -0500
committerInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2016-08-08 21:23:43 +0000
commit5bf86797197217354ae159be056913819d38688e (patch)
treede2f286ca1cbb968da1ce0f4f62e3d8d11b64c5d /ext
parentdcafc14162e2dd49d0ea70b80080f8c23729aef3 (diff)
crypto/tinycrypt: Update README file
This commit updates the tinycrypt README file. Change-Id: I7350b3bb18de106d79347fab7f89345250b580c1 Signed-off-by: Flavio Santes <flavio.santes@intel.com>
Diffstat (limited to 'ext')
-rw-r--r--ext/lib/crypto/tinycrypt/README30
1 files changed, 28 insertions, 2 deletions
diff --git a/ext/lib/crypto/tinycrypt/README b/ext/lib/crypto/tinycrypt/README
index cb1cc543f..9bab359fe 100644
--- a/ext/lib/crypto/tinycrypt/README
+++ b/ext/lib/crypto/tinycrypt/README
@@ -3,7 +3,7 @@ open source project. The original upstream code can be found at:
https://github.com/01org/tinycrypt
-At revision 08ded7f21529c39e5133688ffb93a9d0c94e5c6e
+At revision 297706a14d4024d0e98bbbcae45ce0dcfbcc5c4c
Any changes to the local version should include Zephyr's TinyCrypt
maintainer in the review. That can be found via the git history.
@@ -12,7 +12,7 @@ The following is the license information for this code:
================================================================================
- TinyCrypt Cryptographic Library v1.0
+ TinyCrypt Cryptographic Library
================================================================================
@@ -45,3 +45,29 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
================================================================================
+
+Copyright (c) 2013, Kenneth MacKay
+All rights reserved.
+
+https://github.com/kmackay/micro-ecc
+
+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.
+
+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.
+
+================================================================================