Remove miTLS (microsoft#1398)

hongkiaong · Mar 30, 2021 · dd4f4ed · dd4f4ed
1 parent 8e21db7
commit dd4f4ed
Show file tree

Hide file tree

Showing 29 changed files with 127 additions and 4,055 deletions.
diff --git a/.azure/azure-pipelines.ci.yml b/.azure/azure-pipelines.ci.yml
@@ -103,14 +103,6 @@ stages:
       tls: openssl
       config: Release
       extraBuildArgs: -EnableTelemetryAsserts
-  - template: ./templates/build-config-user.yml
-    parameters:
-      image: windows-latest
-      platform: windows
-      arch: x64
-      tls: mitls
-      config: Release
-      extraBuildArgs: -EnableTelemetryAsserts
 
 - stage: build_windows_debug
   displayName: Build Windows - Debug
@@ -134,14 +126,6 @@ stages:
       tls: stub
       config: Debug
       extraBuildArgs: -EnableTelemetryAsserts
-  - template: ./templates/build-config-user.yml
-    parameters:
-      image: windows-latest
-      platform: windows
-      arch: x64
-      tls: mitls
-      config: Debug
-      extraBuildArgs: -EnableTelemetryAsserts
   - template: ./templates/build-config-user.yml
     parameters:
       image: windows-latest
@@ -456,22 +440,16 @@ stages:
       pool: MsQuic-Win-Latest
       platform: windows
       tls: schannel
-      logProfile: Full.Verbose
+      logProfile: Full.Light
       extraArgs: -Filter -*CryptTest.HpMaskChaCha20:CryptTest.WellKnownChaChaPoly:Alpn.ValidAlpnLengths
       testCerts: true
-  - template: ./templates/run-bvt.yml
-    parameters:
-      image: windows-latest
-      platform: windows
-      tls: mitls
-      logProfile: Full.Light
-      extraArgs: -Filter -*Unreachable/0:CryptTest/CryptTest.Encryption/2:CryptTest.WellKnownChaChaPoly:*HandshakeParam*:CredValidation*
   - template: ./templates/run-bvt.yml
     parameters:
       image: windows-latest
       platform: windows
       tls: openssl
-      extraArgs: -Filter -*Unreachable/0:AppData/*:Misc/*:CredValidation*:*ValidateStream*:*ValidateConnection*
+      logProfile: Full.Light
+      extraArgs: -Filter -*Unreachable/0:CredValidation*:*ValidateStream*:*ValidateConnection*
   - template: ./templates/run-bvt.yml
     parameters:
       image: ubuntu-latest
@@ -582,11 +560,6 @@ stages:
       pool: MsQuic-Win-Latest
       platform: windows
       tls: schannel
-  - template: ./templates/run-quicinterop.yml
-    parameters:
-      image: windows-latest
-      platform: windows
-      tls: mitls
   - template: ./templates/run-quicinterop.yml
     parameters:
       image: windows-latest

diff --git a/.azure/azure-pipelines.perf.yml b/.azure/azure-pipelines.perf.yml
@@ -36,7 +36,6 @@ parameters:
   values:
   - schannel
   - openssl
-  - mitls
 - name: testToRun
   type: string
   displayName: Run Specific Test

diff --git a/.gitmodules b/.gitmodules
@@ -5,10 +5,6 @@
 	path = submodules/openssl
 	url = https://github.com/quictls/openssl.git
 	branch = OpenSSL_1_1_1k+quic
-[submodule "submodules/everest"]
-	path = submodules/everest
-	url = https://github.com/nibanks/everest-dist.git
-	branch = pr/msquic
 [submodule "submodules/wil"]
 	path = submodules/wil
 	url = https://github.com/microsoft/wil
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,15 +22,11 @@ if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
     set(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION 10.0.18362.0 CACHE STRING INTERNAL FORCE)
 endif()
 
-if (QUIC_TLS STREQUAL "mitls")
-    message(WARNING "Policy 0091 unsupported for miTLS.")
+if(POLICY CMP0091)
+    cmake_policy(SET CMP0091 NEW)
+    message(STATUS "Setting policy 0091")
 else()
-    if(POLICY CMP0091)
-        cmake_policy(SET CMP0091 NEW)
-        message(STATUS "Setting policy 0091")
-    else()
-        message(WARNING "CMake version too old to support Policy 0091; CRT static linking won't work")
-    endif()
+    message(WARNING "CMake version too old to support Policy 0091; CRT static linking won't work")
 endif()
 
 if (POLICY CMP0111)
@@ -231,13 +227,6 @@ if(QUIC_TLS STREQUAL "openssl")
     list(APPEND QUIC_COMMON_DEFINES QUIC_DISABLE_CLIENT_CERT_TESTS)
 endif()
 
-if(QUIC_TLS STREQUAL "mitls")
-    message(STATUS "Disabling PFX tests")
-    list(APPEND QUIC_COMMON_DEFINES QUIC_DISABLE_PFX_TESTS)
-    message(STATUS "Disabling client certificate tests")
-    list(APPEND QUIC_COMMON_DEFINES QUIC_DISABLE_CLIENT_CERT_TESTS)
-endif()
-
 if(QUIC_TLS STREQUAL "stub")
     list(APPEND QUIC_COMMON_DEFINES QUIC_TLS_STUB)
     message(STATUS "Disabling PFX tests")
@@ -587,18 +576,6 @@ else()
     endfunction()
 endif()
 
-if(QUIC_TLS STREQUAL "mitls")
-    # Build Everest.
-    add_subdirectory(submodules/everest/msquic/msvc/kremlib)
-    add_subdirectory(submodules/everest/msquic/msvc/evercrypt)
-    add_subdirectory(submodules/everest/msquic/msvc/mitls)
-    add_subdirectory(submodules/everest/msquic/msvc/quiccrypto)
-    set_property(TARGET kremlib PROPERTY FOLDER "libraries")
-    set_property(TARGET evercrypt PROPERTY FOLDER "libraries")
-    set_property(TARGET mitls PROPERTY FOLDER "libraries")
-    set_property(TARGET quiccrypto PROPERTY FOLDER "libraries")
-endif()
-
 if(QUIC_CODE_CHECK)
     find_program(CLANGTIDY NAMES clang-tidy)
     if(CLANGTIDY)

diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES
@@ -185,183 +185,3 @@ License notice for OpenSSL
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-License notice for Everest (mitls)
--------------------------------
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/docs/BUILD.md b/docs/BUILD.md
@@ -123,7 +123,7 @@ The script has a lot of additional configuration options, but the default should
 
 `-Arch <x86/x64/arm/arm64>` Allow for building for different architectures. **x64** is the defualt architecture.
 
-`-Tls <stub/schannel/openssl/mitls>` Allows for building with different TLS providers. The default is platform dependent (Windows = schannel, Linux = openssl).
+`-Tls <stub/schannel/openssl>` Allows for building with different TLS providers. The default is platform dependent (Windows = schannel, Linux = openssl).
 
 `-Clean` Forces a clean build of everything.
 
@@ -164,7 +164,7 @@ The build needs CMake and compiler.
 ```
 brew install cmake
 ```
-Minimally, build needs Xcode 'Command Line Tools`. That can be done via XCode in App Store or from command line  
+Minimally, build needs Xcode 'Command Line Tools`. That can be done via XCode in App Store or from command line
 ```
 xcode-select --install
 ```

diff --git a/docs/InteropServerSetup.md b/docs/InteropServerSetup.md
@@ -6,18 +6,18 @@ One of the tools in the MsQuic repo is `quicinteropserver` ([source](../src/tool
 
 The tool is automatically built with the rest of the repo. See complete build instructions [here](BUILD.md).
 
-There are a few additional things to note beyond the default build instructions. Currently, 0-RTT is only supported on Windows, when using the miTLS TLS library. To build for miTLS, you must use the `-Tls mitls` option when calling `build.ps`. If 0-RTT is not required/needed, then `-Tls schannel` should be fine to use on Windows, and `-Tls openssl` for Linux.
+There are a few additional things to note beyond the default build instructions. Currently, 0-RTT is only supported on Windows, when using the OpenSSL TLS library. To build for OpenSSL, you must use the `-Tls openssl` option when calling `build.ps`. If 0-RTT is not required/needed, then `-Tls schannel` should be fine to use on Windows, and `-Tls openssl` for Linux.
 
 Once built, you can find the `quicinteropserver` in (assuming PowerShell is used to build):
 
 ```
 ./artifacts/bin/{platform}/{arch}_{config}_{tls}
 ```
 
-For example, if you build with `build.ps1 -Config Release -Tls mitls` on Windows, the output would be in:
+For example, if you build with `build.ps1 -Config Release -Tls openssl` on Windows, the output would be in:
 
 ```
-./artifacts/bin/windows/x64_release_mitls
+./artifacts/bin/windows/x64_release_openssl
 ```
 
 The directory contains all the build artifacts, including the base MsQuic library (`msquic.dll` or `libmsquic.so`).

diff --git a/docs/TLS.md b/docs/TLS.md
@@ -52,10 +52,6 @@ MsQuic has a number of implementations for the TLS abstraction layer to support
 
 > **Important** - Currently, OpenSSL doesn't officially have QUIC API support (hopefully coming soon), so MsQuic **temporarily** relies on a [fork of OpenSSL](https://github.com/quictls/openssl) that is purely a fork + a set of (unapproved by OMC) changes to expose some QUIC functionality. This fork is only a **stopgap solution** until OpenSSL officially supports QUIC, at which MsQuic will immediately switch to it.
 
-## miTLS
-
-[miTLS](https://mitls.org/) is an experimental TLS implementation from Microsoft Research. It is not officially supported by MsQuic and is generally just used for testing purposes. It is currently only works on Windows.
-
 # Detailed Design
 
 TO-DO
diff --git a/scripts/FullRunRPS.json b/scripts/FullRunRPS.json
@@ -9,7 +9,7 @@
             "TestName": "RPS",
             "Local": {
                 "Platform": "Windows",
-                "Tls": ["stub", "schannel", "openssl", "mitls"],
+                "Tls": ["stub", "schannel", "openssl"],
                 "Arch": ["x64", "x86", "arm", "arm64"],
                 "Exe": "secnetperf",
                 "Arguments": "-test:RPS -target:$RemoteAddress"