aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2019-10-18 14:48:11 -0700
committerCQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>2019-10-18 22:33:00 +0000
commit7f02881e96e51f1873afcf384d02f782b48967ca (patch)
tree7039acc278a6a849f9ea898df41758155f3b8609 /LICENSE
parent7de9498a886ab28fe4a6023c33cf98524c1090ff (diff)
downloadboringssl-7f02881e96e51f1873afcf384d02f782b48967ca.zip
boringssl-7f02881e96e51f1873afcf384d02f782b48967ca.tar.gz
boringssl-7f02881e96e51f1873afcf384d02f782b48967ca.tar.bz2
Drop CECPQ2b code.fips-android-20191020
The experiment which motivated CECPQ2b has concluded (although the results haven't been published yet) and the SIKE code is causing some issues for gRPC in gprc/grpc#20100. Also, this is code size that takes up space in Android etc. Change-Id: I43b0b8c420f236c0fe9b40bf2517d2fde98495d5 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/38384 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE23
1 files changed, 0 insertions, 23 deletions
diff --git a/LICENSE b/LICENSE
index 2f4dfcd..49c41fa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -181,29 +181,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-The code in third_party/sike also carries the MIT license:
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
-
-
Licenses for support code
-------------------------